<!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>[213807] 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/213807">213807</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 03:32:49 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213405">r213405</a> - Clean up some RenderLayerBacking code
https://bugs.webkit.org/show_bug.cgi?id=169160
Reviewed by Dean Jackson.
Modern loops in descendantLayerPaintsIntoAncestor().
Rename RenderLayerBacking::paintsChildren() to RenderLayerBacking::paintsChildRenderers() to clarify that
it refers to renderers, not RenderLayers.
Rename RenderLayerBacking::paintsNonDirectCompositedBoxDecoration() to RenderLayerBacking::paintsBoxDecorations().
"Paints" already implies non-composited.
No behavior change.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateDrawsContent):
(WebCore::RenderLayerBacking::paintsBoxDecorations):
(WebCore::RenderLayerBacking::paintsChildRenderers):
(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
(WebCore::descendantLayerPaintsIntoAncestor):
(WebCore::RenderLayerBacking::paintsNonDirectCompositedBoxDecoration): Deleted.
(WebCore::RenderLayerBacking::paintsChildren): 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 (213806 => 213807)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:31:43 UTC (rev 213806)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:32:49 UTC (rev 213807)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-03-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Clean up some RenderLayerBacking code
+ https://bugs.webkit.org/show_bug.cgi?id=169160
+
+ Reviewed by Dean Jackson.
+
+ Modern loops in descendantLayerPaintsIntoAncestor().
+
+ Rename RenderLayerBacking::paintsChildren() to RenderLayerBacking::paintsChildRenderers() to clarify that
+ it refers to renderers, not RenderLayers.
+
+ Rename RenderLayerBacking::paintsNonDirectCompositedBoxDecoration() to RenderLayerBacking::paintsBoxDecorations().
+ "Paints" already implies non-composited.
+
+ No behavior change.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateDrawsContent):
+ (WebCore::RenderLayerBacking::paintsBoxDecorations):
+ (WebCore::RenderLayerBacking::paintsChildRenderers):
+ (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+ (WebCore::descendantLayerPaintsIntoAncestor):
+ (WebCore::RenderLayerBacking::paintsNonDirectCompositedBoxDecoration): Deleted.
+ (WebCore::RenderLayerBacking::paintsChildren): Deleted.
+ * rendering/RenderLayerBacking.h:
+
+2017-03-03 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Clean up RenderImage and a RenderImageResource function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169153
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp (213806 => 213807)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-13 10:31:43 UTC (rev 213806)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-13 10:32:49 UTC (rev 213807)
</span><span class="lines">@@ -1270,7 +1270,7 @@
</span><span class="cx"> bool hasNonScrollingPaintedContent = m_owningLayer.hasVisibleContent() && m_owningLayer.hasVisibleBoxDecorationsOrBackground();
</span><span class="cx"> m_graphicsLayer->setDrawsContent(hasNonScrollingPaintedContent);
</span><span class="cx">
</span><del>- bool hasScrollingPaintedContent = m_owningLayer.hasVisibleContent() && (renderer().hasBackground() || paintsChildren());
</del><ins>+ bool hasScrollingPaintedContent = m_owningLayer.hasVisibleContent() && (renderer().hasBackground() || paintsChildRenderers());
</ins><span class="cx"> m_scrollingContentsLayer->setDrawsContent(hasScrollingPaintedContent);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1859,7 +1859,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerBacking::paintsNonDirectCompositedBoxDecoration() const
</del><ins>+bool RenderLayerBacking::paintsBoxDecorations() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_owningLayer.hasVisibleBoxDecorations())
</span><span class="cx"> return false;
</span><span class="lines">@@ -1867,7 +1867,7 @@
</span><span class="cx"> return !supportsDirectBoxDecorationsComposition(renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerBacking::paintsChildren() const
</del><ins>+bool RenderLayerBacking::paintsChildRenderers() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_owningLayer.hasVisibleContent() && m_owningLayer.hasNonEmptyChildRenderers())
</span><span class="cx"> return true;
</span><span class="lines">@@ -1906,7 +1906,7 @@
</span><span class="cx"> if (renderer().isTextControl())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (paintsNonDirectCompositedBoxDecoration() || paintsChildren())
</del><ins>+ if (paintsBoxDecorations() || paintsChildRenderers())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (renderer().style().backgroundClip() == TextFillBox)
</span><span class="lines">@@ -1953,12 +1953,9 @@
</span><span class="cx"> LayerListMutationDetector mutationChecker(&parent);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (Vector<RenderLayer*>* normalFlowList = parent.normalFlowList()) {
- size_t listSize = normalFlowList->size();
- for (size_t i = 0; i < listSize; ++i) {
- RenderLayer* curLayer = normalFlowList->at(i);
- if (!compositedWithOwnBackingStore(*curLayer)
- && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
</del><ins>+ if (auto* normalFlowList = parent.normalFlowList()) {
+ for (auto* childLayer : *normalFlowList) {
+ if (!compositedWithOwnBackingStore(*childLayer) && (childLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*childLayer)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1968,22 +1965,16 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Use the m_hasCompositingDescendant bit to optimize?
</span><del>- if (Vector<RenderLayer*>* negZOrderList = parent.negZOrderList()) {
- size_t listSize = negZOrderList->size();
- for (size_t i = 0; i < listSize; ++i) {
- RenderLayer* curLayer = negZOrderList->at(i);
- if (!compositedWithOwnBackingStore(*curLayer)
- && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
</del><ins>+ if (auto* negZOrderList = parent.negZOrderList()) {
+ for (auto* childLayer : *negZOrderList) {
+ if (!compositedWithOwnBackingStore(*childLayer) && (childLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*childLayer)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Vector<RenderLayer*>* posZOrderList = parent.posZOrderList()) {
- size_t listSize = posZOrderList->size();
- for (size_t i = 0; i < listSize; ++i) {
- RenderLayer* curLayer = posZOrderList->at(i);
- if (!compositedWithOwnBackingStore(*curLayer)
- && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
</del><ins>+ if (auto* posZOrderList = parent.posZOrderList()) {
+ for (auto* childLayer : *posZOrderList) {
+ if (!compositedWithOwnBackingStore(*childLayer) && (childLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*childLayer)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h (213806 => 213807)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h 2017-03-13 10:31:43 UTC (rev 213806)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.h 2017-03-13 10:32:49 UTC (rev 213807)
</span><span class="lines">@@ -309,8 +309,8 @@
</span><span class="cx">
</span><span class="cx"> bool isMainFrameRenderViewLayer() const;
</span><span class="cx">
</span><del>- bool paintsNonDirectCompositedBoxDecoration() const;
- bool paintsChildren() const;
</del><ins>+ bool paintsBoxDecorations() const;
+ bool paintsChildRenderers() const;
</ins><span class="cx">
</span><span class="cx"> // Returns true if this compositing layer has no visible content.
</span><span class="cx"> bool isSimpleContainerCompositingLayer() const;
</span></span></pre>
</div>
</div>
</body>
</html>