<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203776] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203776">203776</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-27 08:58:08 -0700 (Wed, 27 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Coordinated Graphics] Improve scheduling of tasks between threads in CoordinatedGraphicsScene
https://bugs.webkit.org/show_bug.cgi?id=160238
Reviewed by Michael Catanzaro.
This patch makes the following improvements:
- Avoid scheduling tasks to the main thread if the scene is detached.
- Do not take references when not actually sending tasks to another threads.
- Use Function instead of std::function on dispatch methods.
- Remove purgeBackingStores that is actually never called. It's only scheduled from purgeGLResources() that
is always called after detach.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::dispatchOnMainThread):
(WebKit::CoordinatedGraphicsScene::dispatchOnClientRunLoop):
(WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
(WebKit::CoordinatedGraphicsScene::updateViewport):
(WebKit::CoordinatedGraphicsScene::onNewBufferAvailable):
(WebKit::CoordinatedGraphicsScene::commitSceneState):
(WebKit::CoordinatedGraphicsScene::renderNextFrame):
(WebKit::CoordinatedGraphicsScene::purgeGLResources):
(WebKit::CoordinatedGraphicsScene::commitScrollOffset):
(WebKit::CoordinatedGraphicsScene::detach):
(WebKit::CoordinatedGraphicsScene::setActive):
(WebKit::CoordinatedGraphicsScene::dispatchCommitScrollOffset): Deleted.
(WebKit::CoordinatedGraphicsScene::purgeBackingStores): Deleted.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::purgeBackingStores): Deleted.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores): Deleted.
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
* WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
(WebKit::CompositingCoordinator::invalidate):
* WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::invalidate):
(WebKit::CoordinatedLayerTreeHost::purgeBackingStores): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in:
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCompositingCoordinatorcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCompositingCoordinatorh">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostmessagesin">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2016-07-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [Coordinated Graphics] Improve scheduling of tasks between threads in CoordinatedGraphicsScene
+ https://bugs.webkit.org/show_bug.cgi?id=160238
+
+ Reviewed by Michael Catanzaro.
+
+ This patch makes the following improvements:
+
+ - Avoid scheduling tasks to the main thread if the scene is detached.
+ - Do not take references when not actually sending tasks to another threads.
+ - Use Function instead of std::function on dispatch methods.
+ - Remove purgeBackingStores that is actually never called. It's only scheduled from purgeGLResources() that
+ is always called after detach.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::dispatchOnMainThread):
+ (WebKit::CoordinatedGraphicsScene::dispatchOnClientRunLoop):
+ (WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
+ (WebKit::CoordinatedGraphicsScene::updateViewport):
+ (WebKit::CoordinatedGraphicsScene::onNewBufferAvailable):
+ (WebKit::CoordinatedGraphicsScene::commitSceneState):
+ (WebKit::CoordinatedGraphicsScene::renderNextFrame):
+ (WebKit::CoordinatedGraphicsScene::purgeGLResources):
+ (WebKit::CoordinatedGraphicsScene::commitScrollOffset):
+ (WebKit::CoordinatedGraphicsScene::detach):
+ (WebKit::CoordinatedGraphicsScene::setActive):
+ (WebKit::CoordinatedGraphicsScene::dispatchCommitScrollOffset): Deleted.
+ (WebKit::CoordinatedGraphicsScene::purgeBackingStores): Deleted.
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::purgeBackingStores): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+ (WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores): Deleted.
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
+ (WebKit::CompositingCoordinator::invalidate):
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::invalidate):
+ (WebKit::CoordinatedLayerTreeHost::purgeBackingStores): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in:
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
+
+2016-07-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Remove network setup from web process
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160236
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -34,20 +34,28 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::dispatchOnMainThread(std::function<void()>&& function)
</del><ins>+void CoordinatedGraphicsScene::dispatchOnMainThread(Function<void()>&& function)
</ins><span class="cx"> {
</span><del>- if (isMainThread())
</del><ins>+ if (isMainThread()) {
</ins><span class="cx"> function();
</span><del>- else
- RunLoop::main().dispatch(WTFMove(function));
</del><ins>+ return;
+ }
+
+ RunLoop::main().dispatch([protectedThis = makeRef(*this), function = WTFMove(function)] {
+ function();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::dispatchOnClientRunLoop(std::function<void()>&& function)
</del><ins>+void CoordinatedGraphicsScene::dispatchOnClientRunLoop(Function<void()>&& function)
</ins><span class="cx"> {
</span><del>- if (&m_clientRunLoop == &RunLoop::current())
</del><ins>+ if (&m_clientRunLoop == &RunLoop::current()) {
</ins><span class="cx"> function();
</span><del>- else
- m_clientRunLoop.dispatch(WTFMove(function));
</del><ins>+ return;
+ }
+
+ m_clientRunLoop.dispatch([protectedThis = makeRef(*this), function = WTFMove(function)] {
+ function();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool layerShouldHaveBackingStore(TextureMapperLayer* layer)
</span><span class="lines">@@ -113,12 +121,8 @@
</span><span class="cx"> m_textureMapper->endClip();
</span><span class="cx"> m_textureMapper->endPainting();
</span><span class="cx">
</span><del>- if (currentRootLayer->descendantsOrSelfHaveRunningAnimations()) {
- RefPtr<CoordinatedGraphicsScene> protector(this);
- dispatchOnClientRunLoop([protector] {
- protector->updateViewport();
- });
- }
</del><ins>+ if (currentRootLayer->descendantsOrSelfHaveRunningAnimations())
+ updateViewport();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::paintToGraphicsContext(PlatformGraphicsContext* platformContext, const Color& backgroundColor, bool drawsBackground)
</span><span class="lines">@@ -149,9 +153,12 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::updateViewport()
</span><span class="cx"> {
</span><del>- ASSERT(&m_clientRunLoop == &RunLoop::current());
- if (m_client)
- m_client->updateViewport();
</del><ins>+ if (!m_client)
+ return;
+ dispatchOnClientRunLoop([this] {
+ if (m_client)
+ m_client->updateViewport();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::adjustPositionForFixedLayers(const FloatPoint& contentPosition)
</span><span class="lines">@@ -202,10 +209,7 @@
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> void CoordinatedGraphicsScene::onNewBufferAvailable()
</span><span class="cx"> {
</span><del>- RefPtr<CoordinatedGraphicsScene> protector(this);
- dispatchOnClientRunLoop([protector] {
- protector->updateViewport();
- });
</del><ins>+ updateViewport();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -608,16 +612,17 @@
</span><span class="cx"> removeReleasedImageBackingsIfNeeded();
</span><span class="cx">
</span><span class="cx"> // The pending tiles state is on its way for the screen, tell the web process to render the next one.
</span><del>- RefPtr<CoordinatedGraphicsScene> protector(this);
- dispatchOnMainThread([protector] {
- protector->renderNextFrame();
- });
</del><ins>+ renderNextFrame();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::renderNextFrame()
</span><span class="cx"> {
</span><del>- if (m_client)
- m_client->renderNextFrame();
</del><ins>+ if (!m_client)
+ return;
+ dispatchOnMainThread([this] {
+ if (m_client)
+ m_client->renderNextFrame();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::ensureRootLayer()
</span><span class="lines">@@ -656,6 +661,8 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::purgeGLResources()
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_client);
+
</ins><span class="cx"> m_imageBackings.clear();
</span><span class="cx"> m_releasedImageBackings.clear();
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="lines">@@ -673,34 +680,18 @@
</span><span class="cx"> m_textureMapper = nullptr;
</span><span class="cx"> m_backingStores.clear();
</span><span class="cx"> m_backingStoresWithPendingBuffers.clear();
</span><del>-
- setActive(false);
-
- RefPtr<CoordinatedGraphicsScene> protector(this);
- dispatchOnMainThread([protector] {
- protector->purgeBackingStores();
- });
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::dispatchCommitScrollOffset(uint32_t layerID, const IntSize& offset)
-{
- m_client->commitScrollOffset(layerID, offset);
-}
-
</del><span class="cx"> void CoordinatedGraphicsScene::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="cx"> {
</span><del>- RefPtr<CoordinatedGraphicsScene> protector(this);
- dispatchOnMainThread([protector, layerID, offset] {
- protector->dispatchCommitScrollOffset(layerID, offset);
</del><ins>+ if (!m_client)
+ return;
+ dispatchOnMainThread([this, layerID, offset] {
+ if (m_client)
+ m_client->commitScrollOffset(layerID, offset);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::purgeBackingStores()
-{
- if (m_client)
- m_client->purgeBackingStores();
-}
-
</del><span class="cx"> void CoordinatedGraphicsScene::setLayerAnimationsIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
</span><span class="cx"> {
</span><span class="cx"> if (!state.animationsChanged)
</span><span class="lines">@@ -713,7 +704,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> m_renderQueue.clear();
</span><del>- m_client = 0;
</del><ins>+ m_isActive = false;
+ m_client = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::appendUpdate(std::function<void()>&& function)
</span><span class="lines">@@ -728,6 +720,9 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::setActive(bool active)
</span><span class="cx"> {
</span><ins>+ if (!m_client)
+ return;
+
</ins><span class="cx"> if (m_isActive == active)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -736,12 +731,8 @@
</span><span class="cx"> // and cannot be applied to the newly created instance.
</span><span class="cx"> m_renderQueue.clear();
</span><span class="cx"> m_isActive = active;
</span><del>- if (m_isActive) {
- RefPtr<CoordinatedGraphicsScene> protector(this);
- dispatchOnMainThread([protector] {
- protector->renderNextFrame();
- });
- }
</del><ins>+ if (m_isActive)
+ renderNextFrame();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextureMapperLayer* CoordinatedGraphicsScene::findScrollableContentsLayerAt(const FloatPoint& point)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <WebCore/TextureMapperFPSCounter.h>
</span><span class="cx"> #include <WebCore/TextureMapperLayer.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><del>-#include <functional>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> class CoordinatedGraphicsSceneClient {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~CoordinatedGraphicsSceneClient() { }
</span><del>- virtual void purgeBackingStores() = 0;
</del><span class="cx"> virtual void renderNextFrame() = 0;
</span><span class="cx"> virtual void updateViewport() = 0;
</span><span class="cx"> virtual void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset) = 0;
</span><span class="lines">@@ -131,11 +130,10 @@
</span><span class="cx"> void syncRemoteContent();
</span><span class="cx"> void adjustPositionForFixedLayers(const WebCore::FloatPoint& contentPosition);
</span><span class="cx">
</span><del>- void dispatchOnMainThread(std::function<void()>&&);
- void dispatchOnClientRunLoop(std::function<void()>&&);
</del><ins>+ void dispatchOnMainThread(Function<void()>&&);
+ void dispatchOnClientRunLoop(Function<void()>&&);
</ins><span class="cx"> void updateViewport();
</span><span class="cx"> void renderNextFrame();
</span><del>- void purgeBackingStores();
</del><span class="cx">
</span><span class="cx"> void createLayer(WebCore::CoordinatedLayerID);
</span><span class="cx"> void deleteLayer(WebCore::CoordinatedLayerID);
</span><span class="lines">@@ -150,8 +148,6 @@
</span><span class="cx"> void removeBackingStoreIfNeeded(WebCore::TextureMapperLayer*);
</span><span class="cx"> void resetBackingStoreSizeToLayerSize(WebCore::TextureMapperLayer*);
</span><span class="cx">
</span><del>- void dispatchCommitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> void onNewBufferAvailable() override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -140,12 +140,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCompositor::purgeBackingStores()
-{
- ASSERT(isMainThread());
- m_client->purgeBackingStores();
-}
-
</del><span class="cx"> void ThreadedCompositor::renderNextFrame()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> class Client {
</span><span class="cx"> public:
</span><span class="cx"> virtual void setVisibleContentsRect(const WebCore::FloatRect&, const WebCore::FloatPoint&, float) = 0;
</span><del>- virtual void purgeBackingStores() = 0;
</del><span class="cx"> virtual void renderNextFrame() = 0;
</span><span class="cx"> virtual void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset) = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -81,7 +80,6 @@
</span><span class="cx"> ThreadedCompositor(Client*);
</span><span class="cx">
</span><span class="cx"> // CoordinatedGraphicsSceneClient
</span><del>- void purgeBackingStores() override;
</del><span class="cx"> void renderNextFrame() override;
</span><span class="cx"> void updateViewport() override;
</span><span class="cx"> void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -85,11 +85,6 @@
</span><span class="cx"> m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page().pageID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHostProxy::purgeBackingStores()
-{
- m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page().pageID());
-}
-
</del><span class="cx"> void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="cx"> {
</span><span class="cx"> m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page().pageID());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> void updateViewport() override;
</span><span class="cx"> void renderNextFrame() override;
</span><del>- void purgeBackingStores() override;
</del><span class="cx">
</span><span class="cx"> void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -59,6 +59,12 @@
</span><span class="cx"> registeredLayer->setCoordinator(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CompositingCoordinator::invalidate()
+{
+ m_rootLayer = nullptr;
+ purgeBackingStores();
+}
+
</ins><span class="cx"> void CompositingCoordinator::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
</span><span class="cx"> {
</span><span class="cx"> if (m_rootCompositingLayer == graphicsLayer)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCompositingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> CompositingCoordinator(WebCore::Page*, CompositingCoordinator::Client&);
</span><span class="cx"> virtual ~CompositingCoordinator();
</span><span class="cx">
</span><ins>+ void invalidate();
+
</ins><span class="cx"> void setRootCompositingLayer(WebCore::GraphicsLayer*);
</span><span class="cx"> void setViewOverlayRootLayer(WebCore::GraphicsLayer*);
</span><span class="cx"> void sizeDidChange(const WebCore::IntSize&);
</span><span class="lines">@@ -73,11 +75,9 @@
</span><span class="cx">
</span><span class="cx"> void setVisibleContentsRect(const WebCore::FloatRect&, const WebCore::FloatPoint&);
</span><span class="cx"> void renderNextFrame();
</span><del>- void purgeBackingStores();
</del><span class="cx"> void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
</span><span class="cx">
</span><span class="cx"> void createRootLayer(const WebCore::IntSize&);
</span><del>- void clearRootLayer() { m_rootLayer = nullptr; }
</del><span class="cx"> WebCore::GraphicsLayer* rootLayer() const { return m_rootLayer.get(); }
</span><span class="cx"> WebCore::CoordinatedGraphicsLayer* mainContentsLayer();
</span><span class="cx">
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx"> void flushPendingImageBackingChanges();
</span><span class="cx"> void clearPendingStateChanges();
</span><span class="cx">
</span><ins>+ void purgeBackingStores();
+
</ins><span class="cx"> void scheduleReleaseInactiveAtlases();
</span><span class="cx">
</span><span class="cx"> void releaseInactiveAtlasesTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> {
</span><span class="cx"> cancelPendingLayerFlush();
</span><span class="cx">
</span><del>- m_coordinator.clearRootLayer();
</del><ins>+ m_coordinator.invalidate();
</ins><span class="cx"> LayerTreeHost::invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -150,11 +150,6 @@
</span><span class="cx"> m_coordinator.renderNextFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHost::purgeBackingStores()
-{
- m_coordinator.purgeBackingStores();
-}
-
</del><span class="cx"> void CoordinatedLayerTreeHost::didFlushRootLayer(const FloatRect& visibleContentRect)
</span><span class="cx"> {
</span><span class="cx"> // Because our view-relative overlay root layer is not attached to the FrameView's GraphicsLayer tree, we need to flush it manually.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx">
</span><span class="cx"> void setVisibleContentsRect(const WebCore::FloatRect&, const WebCore::FloatPoint&);
</span><span class="cx"> void renderNextFrame();
</span><del>- void purgeBackingStores();
</del><span class="cx"> void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
</span><span class="cx">
</span><span class="cx"> WebCore::GraphicsLayerFactory* graphicsLayerFactory() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> messages -> CoordinatedLayerTreeHost LegacyReceiver {
</span><span class="cx"> SetVisibleContentsRect(WebCore::FloatRect visibleContentsRect, WebCore::FloatPoint trajectoryVectory)
</span><span class="cx"> RenderNextFrame()
</span><del>- PurgeBackingStores()
</del><span class="cx"> CommitScrollOffset(uint32_t layerID, WebCore::IntSize offset)
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (203775 => 203776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-07-27 15:52:24 UTC (rev 203775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-07-27 15:58:08 UTC (rev 203776)
</span><span class="lines">@@ -82,11 +82,6 @@
</span><span class="cx"> m_layerTreeHost.setVisibleContentsRect(rect, trajectoryVector, scale);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void purgeBackingStores() override
- {
- m_layerTreeHost.purgeBackingStores();
- }
-
</del><span class="cx"> void renderNextFrame() override
</span><span class="cx"> {
</span><span class="cx"> m_layerTreeHost.renderNextFrame();
</span></span></pre>
</div>
</div>
</body>
</html>