<!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>[200408] trunk/Source</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/200408">200408</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-05-04 00:39:23 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CoordGraphics] CompositingCoordinator should hande root compositing and view overlay layers separately
https://bugs.webkit.org/show_bug.cgi?id=157305
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Split out handling of the root compositing and the view overlay layers
into two separate methods. Both do nothing if the passed-in layer is
the same as the current one. Otherwise, the current one is removed
from the tree and the new one added to it.
No change in behavior is expected.
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::setRootCompositingLayer):
(WebCore::CompositingCoordinator::setViewOverlayRootLayer):
* platform/graphics/texmap/coordinated/CompositingCoordinator.h:
Source/WebKit2:
Update CoordinatedLayerTreeHost and ThreadCoordinatedLayerTreeHost to
correctly use setRootCompositingLayer() and setViewOverlayRootLayer()
methods on the CompositingCoordinator object.
CoordinatedLayerTreeHost doesn't have to keep a pointer to the root
compositing layer anymore. updateRootLayers() can be removed.
ThreadCoordinatedLayerTreeHost doen't have to keep a pointer to both
the root compositing and the view overlay layers anymore. Similarly,
updateRootLayers() can be removed.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::setViewOverlayRootLayer):
(WebKit::CoordinatedLayerTreeHost::setRootCompositingLayer):
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost): Deleted.
(WebKit::CoordinatedLayerTreeHost::updateRootLayers): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
(WebKit::ThreadedCoordinatedLayerTreeHost::setRootCompositingLayer):
(WebKit::ThreadedCoordinatedLayerTreeHost::setViewOverlayRootLayer):
(WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost): Deleted.
(WebKit::ThreadedCoordinatedLayerTreeHost::updateRootLayers): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebCore/ChangeLog 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-05-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [CoordGraphics] CompositingCoordinator should hande root compositing and view overlay layers separately
+ https://bugs.webkit.org/show_bug.cgi?id=157305
+
+ Reviewed by Carlos Garcia Campos.
+
+ Split out handling of the root compositing and the view overlay layers
+ into two separate methods. Both do nothing if the passed-in layer is
+ the same as the current one. Otherwise, the current one is removed
+ from the tree and the new one added to it.
+
+ No change in behavior is expected.
+
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::setRootCompositingLayer):
+ (WebCore::CompositingCoordinator::setViewOverlayRootLayer):
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
+
+2016-05-04 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [TexMap] Clean up TextureMapperGLData, TextureMapperGLData::SharedGLData
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157303
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -70,17 +70,29 @@
</span><span class="cx"> registeredLayer->setCoordinator(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingCoordinator::setRootCompositingLayer(GraphicsLayer* compositingLayer, GraphicsLayer* overlayLayer)
</del><ins>+void CompositingCoordinator::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
</ins><span class="cx"> {
</span><ins>+ if (m_rootCompositingLayer == graphicsLayer)
+ return;
+
</ins><span class="cx"> if (m_rootCompositingLayer)
</span><span class="cx"> m_rootCompositingLayer->removeFromParent();
</span><span class="cx">
</span><del>- m_rootCompositingLayer = compositingLayer;
</del><ins>+ m_rootCompositingLayer = graphicsLayer;
</ins><span class="cx"> if (m_rootCompositingLayer)
</span><span class="cx"> m_rootLayer->addChildAtIndex(m_rootCompositingLayer, 0);
</span><ins>+}
</ins><span class="cx">
</span><del>- m_overlayCompositingLayer = overlayLayer;
</del><ins>+void CompositingCoordinator::setViewOverlayRootLayer(GraphicsLayer* graphicsLayer)
+{
+ if (m_overlayCompositingLayer == graphicsLayer)
+ return;
+
</ins><span class="cx"> if (m_overlayCompositingLayer)
</span><ins>+ m_overlayCompositingLayer->removeFromParent();
+
+ m_overlayCompositingLayer = graphicsLayer;
+ if (m_overlayCompositingLayer)
</ins><span class="cx"> m_rootLayer->addChild(m_overlayCompositingLayer);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -64,7 +64,8 @@
</span><span class="cx"> CompositingCoordinator(Page*, CompositingCoordinator::Client*);
</span><span class="cx"> virtual ~CompositingCoordinator();
</span><span class="cx">
</span><del>- void setRootCompositingLayer(GraphicsLayer* compositingLayer, GraphicsLayer* overlayLayer);
</del><ins>+ void setRootCompositingLayer(GraphicsLayer*);
+ void setViewOverlayRootLayer(GraphicsLayer*);
</ins><span class="cx"> void sizeDidChange(const IntSize& newSize);
</span><span class="cx"> void deviceOrPageScaleFactorChanged();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-05-04 Zan Dobersek <zdobersek@igalia.com>
+
+ [CoordGraphics] CompositingCoordinator should hande root compositing and view overlay layers separately
+ https://bugs.webkit.org/show_bug.cgi?id=157305
+
+ Reviewed by Carlos Garcia Campos.
+
+ Update CoordinatedLayerTreeHost and ThreadCoordinatedLayerTreeHost to
+ correctly use setRootCompositingLayer() and setViewOverlayRootLayer()
+ methods on the CompositingCoordinator object.
+
+ CoordinatedLayerTreeHost doesn't have to keep a pointer to the root
+ compositing layer anymore. updateRootLayers() can be removed.
+
+ ThreadCoordinatedLayerTreeHost doen't have to keep a pointer to both
+ the root compositing and the view overlay layers anymore. Similarly,
+ updateRootLayers() can be removed.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::setViewOverlayRootLayer):
+ (WebKit::CoordinatedLayerTreeHost::setRootCompositingLayer):
+ (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost): Deleted.
+ (WebKit::CoordinatedLayerTreeHost::updateRootLayers): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
+ (WebKit::ThreadedCoordinatedLayerTreeHost::setRootCompositingLayer):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::setViewOverlayRootLayer):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost): Deleted.
+ (WebKit::ThreadedCoordinatedLayerTreeHost::updateRootLayers): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
+
</ins><span class="cx"> 2016-05-03 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add VideoControlsManager tests
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> , m_layerFlushTimer(*this, &CoordinatedLayerTreeHost::layerFlushTimerFired)
</span><span class="cx"> , m_layerFlushSchedulingEnabled(true)
</span><span class="cx"> , m_forceRepaintAsyncCallbackID(0)
</span><del>- , m_contentLayer(nullptr)
</del><span class="cx"> , m_viewOverlayRootLayer(nullptr)
</span><span class="cx"> {
</span><span class="cx"> m_coordinator = std::make_unique<CompositingCoordinator>(webPage->corePage(), this);
</span><span class="lines">@@ -114,24 +113,15 @@
</span><span class="cx"> m_notifyAfterScheduledLayerFlush = notifyAfterScheduledLayerFlush;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHost::updateRootLayers()
-{
- if (!m_contentLayer && !m_viewOverlayRootLayer)
- return;
-
- m_coordinator->setRootCompositingLayer(m_contentLayer, m_viewOverlayRootLayer);
-}
-
</del><span class="cx"> void CoordinatedLayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer* viewOverlayRootLayer)
</span><span class="cx"> {
</span><span class="cx"> m_viewOverlayRootLayer = viewOverlayRootLayer;
</span><del>- updateRootLayers();
</del><ins>+ m_coordinator->setViewOverlayRootLayer(viewOverlayRootLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer* graphicsLayer)
</span><span class="cx"> {
</span><del>- m_contentLayer = graphicsLayer;
- updateRootLayers();
</del><ins>+ m_coordinator->setRootCompositingLayer(graphicsLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::invalidate()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -88,8 +88,6 @@
</span><span class="cx">
</span><span class="cx"> void layerFlushTimerFired();
</span><span class="cx">
</span><del>- void updateRootLayers();
-
</del><span class="cx"> // CompositingCoordinator::Client
</span><span class="cx"> void didFlushRootLayer(const WebCore::FloatRect& visibleContentRect) override;
</span><span class="cx"> void notifyFlushRequired() override { scheduleLayerFlush(); };
</span><span class="lines">@@ -109,7 +107,6 @@
</span><span class="cx"> bool m_layerFlushSchedulingEnabled;
</span><span class="cx"> uint64_t m_forceRepaintAsyncCallbackID;
</span><span class="cx">
</span><del>- WebCore::GraphicsLayer* m_contentLayer;
</del><span class="cx"> WebCore::GraphicsLayer* m_viewOverlayRootLayer;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -60,8 +60,6 @@
</span><span class="cx"> ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost(WebPage* webPage)
</span><span class="cx"> : LayerTreeHost(webPage)
</span><span class="cx"> , m_forceRepaintAsyncCallbackID(0)
</span><del>- , m_contentLayer(nullptr)
- , m_viewOverlayRootLayer(nullptr)
</del><span class="cx"> , m_notifyAfterScheduledLayerFlush(false)
</span><span class="cx"> , m_isSuspended(false)
</span><span class="cx"> , m_isWaitingForRenderer(false)
</span><span class="lines">@@ -114,8 +112,7 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer* graphicsLayer)
</span><span class="cx"> {
</span><del>- m_contentLayer = graphicsLayer;
- updateRootLayers();
</del><ins>+ m_coordinator->setRootCompositingLayer(graphicsLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::invalidate()
</span><span class="lines">@@ -191,20 +188,11 @@
</span><span class="cx"> m_webPage->scalePage(scale, origin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCoordinatedLayerTreeHost::updateRootLayers()
</del><ins>+void ThreadedCoordinatedLayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* graphicsLayer)
</ins><span class="cx"> {
</span><del>- if (!m_contentLayer && !m_viewOverlayRootLayer)
- return;
-
- m_coordinator->setRootCompositingLayer(m_contentLayer, m_viewOverlayRootLayer);
</del><ins>+ m_coordinator->setViewOverlayRootLayer(graphicsLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCoordinatedLayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* viewOverlayRootLayer)
-{
- m_viewOverlayRootLayer = viewOverlayRootLayer;
- updateRootLayers();
-}
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (200407 => 200408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-05-04 07:36:17 UTC (rev 200407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-05-04 07:39:23 UTC (rev 200408)
</span><span class="lines">@@ -108,8 +108,6 @@
</span><span class="cx"> void compositorDidFlushLayers();
</span><span class="cx"> void didScaleFactorChanged(float scale, const WebCore::IntPoint& origin);
</span><span class="cx">
</span><del>- void updateRootLayers();
-
</del><span class="cx"> void cancelPendingLayerFlush();
</span><span class="cx"> void performScheduledLayerFlush();
</span><span class="cx">
</span><span class="lines">@@ -132,9 +130,6 @@
</span><span class="cx">
</span><span class="cx"> WebCore::IntPoint m_prevScrollPosition;
</span><span class="cx">
</span><del>- WebCore::GraphicsLayer* m_contentLayer;
- WebCore::GraphicsLayer* m_viewOverlayRootLayer;
-
</del><span class="cx"> std::unique_ptr<WebCore::CompositingCoordinator> m_coordinator;
</span><span class="cx"> RefPtr<ThreadedCompositor> m_compositor;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>