<!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>[196058] trunk/Source/WebCore</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/196058">196058</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-02-03 01:54:20 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] CompositingCoordinator should store the overlay layer, flush it as appropriate
https://bugs.webkit.org/show_bug.cgi?id=152058
Reviewed by Michael Catanzaro.
Previously, the CompositingCoordinator only added the overlay layer to the
layer tree, but flushing its compositing state is also required. For that to
happen, CompositingCoordinator has to store a pointer to the overlay layer
object and flush it in ::flushPendingLayerChanges().
Overlay layers are most prominently used by the Web Inspector to highlight
the DOM elements on the Web page that are being hovered in the inspector.
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::CompositingCoordinator):
(WebCore::CompositingCoordinator::setRootCompositingLayer):
(WebCore::CompositingCoordinator::flushPendingLayerChanges):
* platform/graphics/texmap/coordinated/CompositingCoordinator.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196057 => 196058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-03 08:48:49 UTC (rev 196057)
+++ trunk/Source/WebCore/ChangeLog 2016-02-03 09:54:20 UTC (rev 196058)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-02-03 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [TexMap] CompositingCoordinator should store the overlay layer, flush it as appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=152058
+
+ Reviewed by Michael Catanzaro.
+
+ Previously, the CompositingCoordinator only added the overlay layer to the
+ layer tree, but flushing its compositing state is also required. For that to
+ happen, CompositingCoordinator has to store a pointer to the overlay layer
+ object and flush it in ::flushPendingLayerChanges().
+
+ Overlay layers are most prominently used by the Web Inspector to highlight
+ the DOM elements on the Web page that are being hovered in the inspector.
+
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::CompositingCoordinator):
+ (WebCore::CompositingCoordinator::setRootCompositingLayer):
+ (WebCore::CompositingCoordinator::flushPendingLayerChanges):
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
+
+2016-02-03 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [CoordinatedGraphics] CompositingCoordinator destructor is scheduling layer flushes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153823
</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 (196057 => 196058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2016-02-03 08:48:49 UTC (rev 196057)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2016-02-03 09:54:20 UTC (rev 196058)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_rootCompositingLayer(nullptr)
</span><ins>+ , m_overlayCompositingLayer(nullptr)
</ins><span class="cx"> , m_isDestructing(false)
</span><span class="cx"> , m_isPurging(false)
</span><span class="cx"> , m_isFlushingLayerChanges(false)
</span><span class="lines">@@ -78,8 +79,9 @@
</span><span class="cx"> if (m_rootCompositingLayer)
</span><span class="cx"> m_rootLayer->addChildAtIndex(m_rootCompositingLayer, 0);
</span><span class="cx">
</span><del>- if (overlayLayer)
- m_rootLayer->addChild(overlayLayer);
</del><ins>+ m_overlayCompositingLayer = overlayLayer;
+ if (m_overlayCompositingLayer)
+ m_rootLayer->addChild(m_overlayCompositingLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::sizeDidChange(const IntSize& newSize)
</span><span class="lines">@@ -94,9 +96,13 @@
</span><span class="cx">
</span><span class="cx"> initializeRootCompositingLayerIfNeeded();
</span><span class="cx">
</span><del>- m_rootLayer->flushCompositingStateForThisLayerOnly(m_page->mainFrame().view()->viewportIsStable());
</del><ins>+ bool viewportIsStable = m_page->mainFrame().view()->viewportIsStable();
+ m_rootLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
</ins><span class="cx"> m_client->didFlushRootLayer(m_visibleContentsRect);
</span><span class="cx">
</span><ins>+ if (m_overlayCompositingLayer)
+ m_overlayCompositingLayer->flushCompositingState(FloatRect(FloatPoint(), m_rootLayer->size()), viewportIsStable);
+
</ins><span class="cx"> bool didSync = m_page->mainFrame().view()->flushCompositingStateIncludingSubframes();
</span><span class="cx">
</span><span class="cx"> toCoordinatedGraphicsLayer(m_rootLayer.get())->updateContentBuffersIncludingSubLayers();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h (196057 => 196058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2016-02-03 08:48:49 UTC (rev 196057)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2016-02-03 09:54:20 UTC (rev 196058)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_rootLayer;
</span><span class="cx"> GraphicsLayer* m_rootCompositingLayer;
</span><ins>+ GraphicsLayer* m_overlayCompositingLayer;
</ins><span class="cx">
</span><span class="cx"> CoordinatedGraphicsState m_state;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>