<!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>[212676] branches/safari-603-branch</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/212676">212676</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-20 13:48:43 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211750">r211750</a>. rdar://problem/30383964</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtiledbackinginwindowexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicsGraphicsLayercpp">branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicsGraphicsLayerh">branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-02-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211750. rdar://problem/30383964
+
+ 2017-02-06 Simon Fraser <simon.fraser@apple.com>
+
+ Safari pages are blank sometimes (missing tiles)
+ https://bugs.webkit.org/show_bug.cgi?id=167904
+
+ Reviewed by Tim Horton.
+
+ New result; this test detected the bug.
+
+ * tiled-drawing/tiled-backing-in-window-expected.txt:
+
+2017-02-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212650. rdar://problem/30604254
</span><span class="cx">
</span><span class="cx"> 2017-02-20 Jon Lee <jonlee@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtiledbackinginwindowexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 1016)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><del>- (in window 1)
</del><ins>+ (in window 0)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2017-02-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211750. rdar://problem/30383964
+
+ 2017-02-06 Simon Fraser <simon.fraser@apple.com>
+
+ Safari pages are blank sometimes (missing tiles)
+ https://bugs.webkit.org/show_bug.cgi?id=167904
+
+ Reviewed by Tim Horton.
+
+ After r211683 we failed to udpate the "inWindow" flag on the page tiled layer, because
+ usingTiledBacking() on GraphicsLayer confusingly was false for the page tiled layer.
+
+ Fix by removing usingTiledBacking() entirely, and checking for tiledBacking(),
+ looking at the layer type when necessary.
+
+ Tested by tiled-drawing/tiled-backing-in-window.html
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::GraphicsLayer):
+ (WebCore::GraphicsLayer::setIsInWindowIncludingDescendants): This is the bug fix.
+ (WebCore::GraphicsLayer::getDebugBorderInfo):
+ (WebCore::GraphicsLayer::dumpProperties):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::usingTiledBacking): Deleted.
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+ (WebCore::GraphicsLayerCA::changeLayerTypeTo):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::willDestroyLayer):
+ (WebCore::RenderLayerBacking::compositingLayerType):
+ * rendering/RenderLayerCompositor.cpp: A bit more logging.
+ (WebCore::RenderLayerCompositor::setIsInWindow):
+ (WebCore::RenderLayerCompositor::attachRootLayer):
+
+2017-02-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212651. rdar://problem/30604254
</span><span class="cx">
</span><span class="cx"> 2017-02-20 Jon Lee <jonlee@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -117,7 +117,6 @@
</span><span class="cx"> , m_contentsOpaque(false)
</span><span class="cx"> , m_preserves3D(false)
</span><span class="cx"> , m_backfaceVisibility(true)
</span><del>- , m_usingTiledBacking(false)
</del><span class="cx"> , m_masksToBounds(false)
</span><span class="cx"> , m_drawsContent(false)
</span><span class="cx"> , m_contentsVisible(true)
</span><span class="lines">@@ -366,8 +365,8 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayer::setIsInWindow(bool inWindow)
</span><span class="cx"> {
</span><del>- if (usingTiledBacking())
- tiledBacking()->setIsInWindow(inWindow);
</del><ins>+ if (TiledBacking* tiledBacking = this->tiledBacking())
+ tiledBacking->setIsInWindow(inWindow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayer::setReplicatedByLayer(GraphicsLayer* layer)
</span><span class="lines">@@ -452,7 +451,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (drawsContent()) {
</span><del>- if (m_usingTiledBacking) {
</del><ins>+ if (tiledBacking()) {
</ins><span class="cx"> color = Color(255, 128, 0, 128); // tiled layer: orange
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -752,9 +751,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_usingTiledBacking) {
</del><ins>+ if (type() == Type::Normal && tiledBacking()) {
</ins><span class="cx"> writeIndent(ts, indent + 1);
</span><del>- ts << "(usingTiledLayer " << m_usingTiledBacking << ")\n";
</del><ins>+ ts << "(usingTiledLayer 1)\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool needsIOSDumpRenderTreeMainFrameRenderViewLayerIsAlwaysOpaqueHack = m_client.needsIOSDumpRenderTreeMainFrameRenderViewLayerIsAlwaysOpaqueHack(*this);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.h (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.h 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/GraphicsLayer.h 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -540,7 +540,6 @@
</span><span class="cx"> // Return an estimate of the backing store memory cost (in bytes). May be incorrect for tiled layers.
</span><span class="cx"> WEBCORE_EXPORT virtual double backingStoreMemoryEstimate() const;
</span><span class="cx">
</span><del>- bool usingTiledBacking() const { return m_usingTiledBacking; }
</del><span class="cx"> virtual TiledBacking* tiledBacking() const { return 0; }
</span><span class="cx">
</span><span class="cx"> void resetTrackedRepaints();
</span><span class="lines">@@ -631,7 +630,6 @@
</span><span class="cx"> bool m_contentsOpaque : 1;
</span><span class="cx"> bool m_preserves3D: 1;
</span><span class="cx"> bool m_backfaceVisibility : 1;
</span><del>- bool m_usingTiledBacking : 1;
</del><span class="cx"> bool m_masksToBounds : 1;
</span><span class="cx"> bool m_drawsContent : 1;
</span><span class="cx"> bool m_contentsVisible : 1;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx"> #ifdef VISIBLE_TILE_WASH
</span><span class="cx"> // Use having a transform as a key to making the tile wash layer. If every layer gets a wash,
</span><span class="cx"> // they start to obscure useful information.
</span><del>- if ((!m_transform.isIdentity() || m_usingTiledBacking) && !m_visibleTileWashLayer) {
</del><ins>+ if ((!m_transform.isIdentity() || tiledBacking()) && !m_visibleTileWashLayer) {
</ins><span class="cx"> static NeverDestroyed<Color> washFillColor(255, 0, 0, 50);
</span><span class="cx"> static NeverDestroyed<Color> washBorderColor(255, 0, 0, 100);
</span><span class="cx">
</span><span class="lines">@@ -1545,13 +1545,15 @@
</span><span class="cx">
</span><span class="cx"> bool needTiledLayer = requiresTiledLayer(pageScaleFactor);
</span><span class="cx"> bool needBackdropLayerType = (customAppearance() == LightBackdropAppearance || customAppearance() == DarkBackdropAppearance);
</span><del>- PlatformCALayer::LayerType neededLayerType = m_layer->layerType();
</del><span class="cx">
</span><ins>+ PlatformCALayer::LayerType currentLayerType = m_layer->layerType();
+ PlatformCALayer::LayerType neededLayerType = currentLayerType;
+
</ins><span class="cx"> if (needBackdropLayerType)
</span><span class="cx"> neededLayerType = layerTypeForCustomBackdropAppearance(customAppearance());
</span><span class="cx"> else if (needTiledLayer)
</span><span class="cx"> neededLayerType = PlatformCALayer::LayerTypeTiledBackingLayer;
</span><del>- else if (isCustomBackdropLayerType(m_layer->layerType()) || m_usingTiledBacking)
</del><ins>+ else if (currentLayerType == PlatformCALayer::LayerTypeTiledBackingLayer || isCustomBackdropLayerType(m_layer->layerType()))
</ins><span class="cx"> neededLayerType = PlatformCALayer::LayerTypeWebLayer;
</span><span class="cx">
</span><span class="cx"> if (neededLayerType != m_layer->layerType())
</span><span class="lines">@@ -3553,11 +3555,12 @@
</span><span class="cx"> if (newLayerType == oldLayerType)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ bool wasTiledLayer = oldLayerType == PlatformCALayer::LayerTypeTiledBackingLayer;
+ bool isTiledLayer = newLayerType == PlatformCALayer::LayerTypeTiledBackingLayer;
+
</ins><span class="cx"> RefPtr<PlatformCALayer> oldLayer = m_layer;
</span><del>-
</del><span class="cx"> m_layer = createPlatformCALayer(newLayerType, this);
</span><span class="cx">
</span><del>- m_usingTiledBacking = newLayerType == PlatformCALayer::LayerTypeTiledBackingLayer;
</del><span class="cx"> m_usingBackdropLayerType = isCustomBackdropLayerType(newLayerType);
</span><span class="cx">
</span><span class="cx"> m_layer->adoptSublayers(*oldLayer);
</span><span class="lines">@@ -3596,7 +3599,7 @@
</span><span class="cx"> | NameChanged
</span><span class="cx"> | DebugIndicatorsChanged;
</span><span class="cx">
</span><del>- if (m_usingTiledBacking)
</del><ins>+ if (isTiledLayer)
</ins><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx">
</span><span class="cx"> moveAnimations(oldLayer.get(), m_layer.get());
</span><span class="lines">@@ -3604,8 +3607,8 @@
</span><span class="cx"> // need to tell new layer to draw itself
</span><span class="cx"> setNeedsDisplay();
</span><span class="cx">
</span><del>- if (oldLayerType == PlatformCALayer::LayerTypeTiledBackingLayer || newLayerType == PlatformCALayer::LayerTypeTiledBackingLayer)
- client().tiledBackingUsageChanged(this, m_usingTiledBacking);
</del><ins>+ if (wasTiledLayer || isTiledLayer)
+ client().tiledBackingUsageChanged(this, isTiledLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsLayer::CompositingCoordinatesOrientation GraphicsLayerCA::defaultContentsOrientation() const
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::willDestroyLayer(const GraphicsLayer* layer)
</span><span class="cx"> {
</span><del>- if (layer && layer->usingTiledBacking())
</del><ins>+ if (layer && layer->type() == GraphicsLayer::Type::Normal && layer->tiledBacking())
</ins><span class="cx"> compositor().layerTiledBackingUsageChanged(layer, false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2822,7 +2822,7 @@
</span><span class="cx"> return MediaCompositingLayer;
</span><span class="cx">
</span><span class="cx"> if (m_graphicsLayer->drawsContent())
</span><del>- return m_graphicsLayer->usingTiledBacking() ? TiledCompositingLayer : NormalCompositingLayer;
</del><ins>+ return m_graphicsLayer->tiledBacking() ? TiledCompositingLayer : NormalCompositingLayer;
</ins><span class="cx">
</span><span class="cx"> return ContainerCompositingLayer;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (212675 => 212676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-20 21:48:39 UTC (rev 212675)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-20 21:48:43 UTC (rev 212676)
</span><span class="lines">@@ -2060,6 +2060,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::setIsInWindow(bool isInWindow)
</span><span class="cx"> {
</span><ins>+ LOG(Compositing, "RenderLayerCompositor %p setIsInWindow %d", this, isInWindow);
+
</ins><span class="cx"> if (!inCompositingMode())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3478,6 +3480,8 @@
</span><span class="cx"> if (!m_rootContentLayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Compositing, "RenderLayerCompositor %p attachRootLayer %d", this, attachment);
+
</ins><span class="cx"> switch (attachment) {
</span><span class="cx"> case RootLayerUnattached:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre>
</div>
</div>
</body>
</html>