<!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>[211760] 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/211760">211760</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-06 17:20:05 -0800 (Mon, 06 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tiled scrolling indicator gets doubled up on navigation
https://bugs.webkit.org/show_bug.cgi?id=167909
Reviewed by Tim Horton.
TiledCoreAnimationDrawingArea::updateDebugInfoLayer() would parent a new m_debugInfoLayer
in m_hostingLayer without removing the old one, causing the old tiled scrolling indicator layer
hierarchy to get left in the layer tree.
Also a couple of nullptr/0 -> nil.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
(WebKit::TiledCoreAnimationDrawingArea::updateDebugInfoLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211759 => 211760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-07 00:29:00 UTC (rev 211759)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-07 01:20:05 UTC (rev 211760)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-06 Simon Fraser <simon.fraser@apple.com>
+
+ Tiled scrolling indicator gets doubled up on navigation
+ https://bugs.webkit.org/show_bug.cgi?id=167909
+
+ Reviewed by Tim Horton.
+
+ TiledCoreAnimationDrawingArea::updateDebugInfoLayer() would parent a new m_debugInfoLayer
+ in m_hostingLayer without removing the old one, causing the old tiled scrolling indicator layer
+ hierarchy to get left in the layer tree.
+
+ Also a couple of nullptr/0 -> nil.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
+ (WebKit::TiledCoreAnimationDrawingArea::updateDebugInfoLayer):
+
</ins><span class="cx"> 2017-02-06 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> More build fixes after r211751
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (211759 => 211760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2017-02-07 00:29:00 UTC (rev 211759)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2017-02-07 01:20:05 UTC (rev 211760)
</span><span class="lines">@@ -651,9 +651,9 @@
</span><span class="cx"> updateRootLayers();
</span><span class="cx">
</span><span class="cx"> if (hadRootLayer != !!layer)
</span><del>- m_layerHostingContext->setRootLayer(layer ? m_hostingLayer.get() : 0);
</del><ins>+ m_layerHostingContext->setRootLayer(layer ? m_hostingLayer.get() : nil);
</ins><span class="cx">
</span><del>- updateDebugInfoLayer(m_webPage.corePage()->settings().showTiledScrollingIndicator());
</del><ins>+ updateDebugInfoLayer(layer && m_webPage.corePage()->settings().showTiledScrollingIndicator());
</ins><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="lines">@@ -666,6 +666,11 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingArea::updateDebugInfoLayer(bool showLayer)
</span><span class="cx"> {
</span><ins>+ if (m_debugInfoLayer) {
+ [m_debugInfoLayer removeFromSuperlayer];
+ m_debugInfoLayer = nil;
+ }
+
</ins><span class="cx"> if (showLayer) {
</span><span class="cx"> if (TiledBacking* tiledBacking = mainFrameTiledBacking()) {
</span><span class="cx"> if (PlatformCALayer* indicatorLayer = tiledBacking->tiledScrollingIndicatorLayer())
</span><span class="lines">@@ -673,14 +678,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_debugInfoLayer) {
</span><del>-#ifndef NDEBUG
</del><span class="cx"> [m_debugInfoLayer setName:@"Debug Info"];
</span><del>-#endif
</del><span class="cx"> [m_hostingLayer addSublayer:m_debugInfoLayer.get()];
</span><span class="cx"> }
</span><del>- } else if (m_debugInfoLayer) {
- [m_debugInfoLayer removeFromSuperlayer];
- m_debugInfoLayer = nullptr;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>