Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2011-01-25 Anders Carlsson <andersca@apple.com>
Reviewed by Adam Roben.
Add and implement LayerTreeHost::scheduleLayerFlush
https://bugs.webkit.org/show_bug.cgi?id=53135
* WebKit2.xcodeproj/project.pbxproj:
Add LayerTreeHostMac.mm.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::scheduleCompositingLayerSync):
Call LayerTreeHost::scheduleLayerFlush.
* WebProcess/WebPage/LayerTreeHost.cpp:
(WebKit::LayerTreeHost::~LayerTreeHost):
Call platformInvalidate().
(WebKit::LayerTreeHost::flushPendingLayerChanges):
Rename from syncCompositingLayers.
* WebProcess/WebPage/mac/LayerTreeHostMac.mm: Added.
(WebKit::LayerTreeHost::scheduleLayerFlush):
Create a run loop observer if needed. This code is copied from LayerBackedDrawingAreaMac.mm
(WebKit::LayerTreeHost::platformInvalidate):
Invalidate the run loop observer.
(WebKit::LayerTreeHost::flushPendingLayerChangesRunLoopObserverCallback):
Call flushPendingChanges() and remove the run loop observer if it succeeded.
Canonical link: https://commits.webkit.org/66877@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76653 268f45cc-cd09-0410-ab3c-d52691b4dbfc- Loading branch information
Anders Carlsson
committed
Jan 26, 2011
1 parent
52b5bc3
commit 1b325af
Showing
6 changed files
with
121 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (C) 2011 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "LayerTreeHost.h" | ||
|
|
||
| namespace WebKit { | ||
|
|
||
| void LayerTreeHost::scheduleLayerFlush() | ||
| { | ||
| CFRunLoopRef currentRunLoop = CFRunLoopGetCurrent(); | ||
|
|
||
| // Make sure we wake up the loop or the observer could be delayed until some other source fires. | ||
| CFRunLoopWakeUp(currentRunLoop); | ||
|
|
||
| if (m_flushPendingLayerChangesRunLoopObserver) | ||
| return; | ||
|
|
||
| // Run before the Core Animation commit observer, which has order 2000000. | ||
| const CFIndex runLoopOrder = 2000000 - 1; | ||
| CFRunLoopObserverContext context = { 0, this, 0, 0, 0 }; | ||
| m_flushPendingLayerChangesRunLoopObserver.adoptCF(CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting | kCFRunLoopExit, true, runLoopOrder, flushPendingLayerChangesRunLoopObserverCallback, &context)); | ||
|
|
||
| CFRunLoopAddObserver(currentRunLoop, m_flushPendingLayerChangesRunLoopObserver.get(), kCFRunLoopCommonModes); | ||
| } | ||
|
|
||
| void LayerTreeHost::platformInvalidate() | ||
| { | ||
| if (m_flushPendingLayerChangesRunLoopObserver) | ||
| CFRunLoopObserverInvalidate(m_flushPendingLayerChangesRunLoopObserver.get()); | ||
| } | ||
|
|
||
| void LayerTreeHost::flushPendingLayerChangesRunLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context) | ||
| { | ||
| static_cast<LayerTreeHost*>(context)->flushPendingLayerChangesRunLoopObserverCallback(); | ||
| } | ||
|
|
||
| void LayerTreeHost::flushPendingLayerChangesRunLoopObserverCallback() | ||
| { | ||
| if (!flushPendingLayerChanges()) | ||
| return; | ||
|
|
||
| // We successfully flushed the pending layer changes, remove the run loop observer. | ||
| ASSERT(m_flushPendingLayerChangesRunLoopObserver); | ||
| CFRunLoopObserverInvalidate(m_flushPendingLayerChangesRunLoopObserver.get()); | ||
| m_flushPendingLayerChangesRunLoopObserver = 0; | ||
| } | ||
|
|
||
| } // namespace WebKit |