<!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>[213810] releases/WebKitGTK/webkit-2.16/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/213810">213810</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 03:37:34 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213435">r213435</a> - Make some RenderLayer tree traversal in RenderLayerBacking more generic
https://bugs.webkit.org/show_bug.cgi?id=169177
Reviewed by Zalan Bujtas.
The real goal of this patch is reduce the number of callers of
RenderLayerBacking::isPaintDestinationForDescendantLayers() to one. To achieve that,
have the setContentsVisible() logic (which is really just about the CSS 'visibility' property)
do its own tree traversal which just consults layer.hasVisibleContent(). So
make descendantLayerPaintsIntoAncestor() a generic traversal function which walks
descendant layers which may paint into the target layer. The "Visible" in the name
reflects the fact that it can bypass a subtree for a layer with !hasVisibleDescendant().
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateAfterDescendants):
(WebCore::traverseVisibleNonCompositedDescendantLayers):
(WebCore::RenderLayerBacking::isPaintDestinationForDescendantLayers):
(WebCore::RenderLayerBacking::hasVisibleNonCompositedDescendants):
(WebCore::descendantLayerPaintsIntoAncestor): Deleted.
* rendering/RenderLayerBacking.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerBackingcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerBackingh">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213809 => 213810)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:36:27 UTC (rev 213809)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:37:34 UTC (rev 213810)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-05 Simon Fraser <simon.fraser@apple.com>
+
+ Make some RenderLayer tree traversal in RenderLayerBacking more generic
+ https://bugs.webkit.org/show_bug.cgi?id=169177
+
+ Reviewed by Zalan Bujtas.
+
+ The real goal of this patch is reduce the number of callers of
+ RenderLayerBacking::isPaintDestinationForDescendantLayers() to one. To achieve that,
+ have the setContentsVisible() logic (which is really just about the CSS 'visibility' property)
+ do its own tree traversal which just consults layer.hasVisibleContent(). So
+ make descendantLayerPaintsIntoAncestor() a generic traversal function which walks
+ descendant layers which may paint into the target layer. The "Visible" in the name
+ reflects the fact that it can bypass a subtree for a layer with !hasVisibleDescendant().
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateAfterDescendants):
+ (WebCore::traverseVisibleNonCompositedDescendantLayers):
+ (WebCore::RenderLayerBacking::isPaintDestinationForDescendantLayers):
+ (WebCore::RenderLayerBacking::hasVisibleNonCompositedDescendants):
+ (WebCore::descendantLayerPaintsIntoAncestor): Deleted.
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2017-03-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Clarify some terminology in RenderLayerBacking
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp (213809 => 213810)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-13 10:36:27 UTC (rev 213809)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-13 10:37:34 UTC (rev 213810)
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx">
</span><span class="cx"> updateDrawsContent(isSimpleContainer);
</span><span class="cx">
</span><del>- m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || isPaintDestinationForDescendantLayers());
</del><ins>+ m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || hasVisibleNonCompositedDescendants());
</ins><span class="cx"> if (m_scrollingLayer) {
</span><span class="cx"> m_scrollingLayer->setContentsVisible(renderer().style().visibility() == VISIBLE);
</span><span class="cx"> m_scrollingLayer->setUserInteractionEnabled(renderer().style().pointerEvents() != PE_NONE);
</span><span class="lines">@@ -1947,7 +1947,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool descendantLayerPaintsIntoAncestor(RenderLayer& parent)
</del><ins>+enum class LayerTraversal { Continue, Stop };
+
+static LayerTraversal traverseVisibleNonCompositedDescendantLayers(RenderLayer& parent, std::function<LayerTraversal (const RenderLayer&)> layerFunc)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512.
</span><span class="cx"> parent.updateLayerListsIfNeeded();
</span><span class="lines">@@ -1958,40 +1960,75 @@
</span><span class="cx">
</span><span class="cx"> if (auto* normalFlowList = parent.normalFlowList()) {
</span><span class="cx"> for (auto* childLayer : *normalFlowList) {
</span><del>- if (!compositedWithOwnBackingStore(*childLayer) && (childLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*childLayer)))
- return true;
</del><ins>+ if (compositedWithOwnBackingStore(*childLayer))
+ continue;
+
+ if (layerFunc(*childLayer) == LayerTraversal::Stop)
+ return LayerTraversal::Stop;
+
+ if (traverseVisibleNonCompositedDescendantLayers(*childLayer, layerFunc) == LayerTraversal::Stop)
+ return LayerTraversal::Stop;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (parent.isStackingContainer()) {
</span><span class="cx"> if (!parent.hasVisibleDescendant())
</span><del>- return false;
</del><ins>+ return LayerTraversal::Continue;
</ins><span class="cx">
</span><span class="cx"> // Use the m_hasCompositingDescendant bit to optimize?
</span><span class="cx"> if (auto* negZOrderList = parent.negZOrderList()) {
</span><span class="cx"> for (auto* childLayer : *negZOrderList) {
</span><del>- if (!compositedWithOwnBackingStore(*childLayer) && (childLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*childLayer)))
- return true;
</del><ins>+ if (compositedWithOwnBackingStore(*childLayer))
+ continue;
+
+ if (layerFunc(*childLayer) == LayerTraversal::Stop)
+ return LayerTraversal::Stop;
+
+ if (traverseVisibleNonCompositedDescendantLayers(*childLayer, layerFunc) == LayerTraversal::Stop)
+ return LayerTraversal::Stop;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto* posZOrderList = parent.posZOrderList()) {
</span><span class="cx"> for (auto* childLayer : *posZOrderList) {
</span><del>- if (!compositedWithOwnBackingStore(*childLayer) && (childLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*childLayer)))
- return true;
</del><ins>+ if (compositedWithOwnBackingStore(*childLayer))
+ continue;
+
+ if (layerFunc(*childLayer) == LayerTraversal::Stop)
+ return LayerTraversal::Stop;
+
+ if (traverseVisibleNonCompositedDescendantLayers(*childLayer, layerFunc) == LayerTraversal::Stop)
+ return LayerTraversal::Stop;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ return LayerTraversal::Continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Conservative test for having no rendered children.
</span><span class="cx"> bool RenderLayerBacking::isPaintDestinationForDescendantLayers() const
</span><span class="cx"> {
</span><del>- return descendantLayerPaintsIntoAncestor(m_owningLayer);
</del><ins>+ bool hasPaintingDescendant = false;
+ traverseVisibleNonCompositedDescendantLayers(m_owningLayer, [&hasPaintingDescendant](const RenderLayer& layer) {
+ hasPaintingDescendant = layer.isVisuallyNonEmpty();
+ return hasPaintingDescendant ? LayerTraversal::Stop : LayerTraversal::Continue;
+ });
+
+ return hasPaintingDescendant;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderLayerBacking::hasVisibleNonCompositedDescendants() const
+{
+ bool hasVisibleDescendant = false;
+ traverseVisibleNonCompositedDescendantLayers(m_owningLayer, [&hasVisibleDescendant](const RenderLayer& layer) {
+ hasVisibleDescendant = layer.hasVisibleContent();
+ return hasVisibleDescendant ? LayerTraversal::Stop : LayerTraversal::Continue;
+ });
+
+ return hasVisibleDescendant;
+}
+
</ins><span class="cx"> bool RenderLayerBacking::containsPaintedContent(bool isSimpleContainer) const
</span><span class="cx"> {
</span><span class="cx"> if (isSimpleContainer || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer.isReflection())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h (213809 => 213810)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h 2017-03-13 10:36:27 UTC (rev 213809)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h 2017-03-13 10:37:34 UTC (rev 213810)
</span><span class="lines">@@ -329,6 +329,7 @@
</span><span class="cx"> void resetContentsRect();
</span><span class="cx">
</span><span class="cx"> bool isPaintDestinationForDescendantLayers() const;
</span><ins>+ bool hasVisibleNonCompositedDescendants() const;
</ins><span class="cx">
</span><span class="cx"> bool shouldClipCompositedBounds() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>