<!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>[189083] 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/189083">189083</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 20:51:13 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tiny cleanup in RenderLayer::enclosingCompositingLayerForRepaint()
https://bugs.webkit.org/show_bug.cgi?id=148541
Reviewed by Tim Horton.
No change in functionality.
* rendering/RenderLayer.cpp:
(WebCore::compositingContainer):
(WebCore::compositedWithOwnBackingStore):
(WebCore::RenderLayer::enclosingCompositingLayer):
(WebCore::RenderLayer::enclosingCompositingLayerForRepaint):
(WebCore::RenderLayer::enclosingFilterRepaintLayer):
(WebCore::RenderLayer::clippingRootForPainting):
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::descendantLayerPaintsIntoAncestor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189082 => 189083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-28 02:28:35 UTC (rev 189082)
+++ trunk/Source/WebCore/ChangeLog 2015-08-28 03:51:13 UTC (rev 189083)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Tiny cleanup in RenderLayer::enclosingCompositingLayerForRepaint()
+ https://bugs.webkit.org/show_bug.cgi?id=148541
+
+ Reviewed by Tim Horton.
+
+ No change in functionality.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::compositingContainer):
+ (WebCore::compositedWithOwnBackingStore):
+ (WebCore::RenderLayer::enclosingCompositingLayer):
+ (WebCore::RenderLayer::enclosingCompositingLayerForRepaint):
+ (WebCore::RenderLayer::enclosingFilterRepaintLayer):
+ (WebCore::RenderLayer::clippingRootForPainting):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::descendantLayerPaintsIntoAncestor):
+
</ins><span class="cx"> 2015-08-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r189079.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (189082 => 189083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-08-28 02:28:35 UTC (rev 189082)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-08-28 03:51:13 UTC (rev 189083)
</span><span class="lines">@@ -1515,9 +1515,9 @@
</span><span class="cx"> return curr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline const RenderLayer* compositingContainer(const RenderLayer* layer)
</del><ins>+static inline const RenderLayer* compositingContainer(const RenderLayer& layer)
</ins><span class="cx"> {
</span><del>- return layer->isNormalFlowOnly() ? layer->parent() : layer->stackingContainer();
</del><ins>+ return layer.isNormalFlowOnly() ? layer.parent() : layer.stackingContainer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool RenderLayer::shouldRepaintAfterLayout() const
</span><span class="lines">@@ -1531,9 +1531,9 @@
</span><span class="cx"> return !isComposited() || backing()->paintsIntoCompositedAncestor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool compositedWithOwnBackingStore(const RenderLayer* layer)
</del><ins>+bool compositedWithOwnBackingStore(const RenderLayer& layer)
</ins><span class="cx"> {
</span><del>- return layer->isComposited() && !layer->backing()->paintsIntoCompositedAncestor();
</del><ins>+ return layer.isComposited() && !layer.backing()->paintsIntoCompositedAncestor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderLayer::enclosingCompositingLayer(IncludeSelfOrNot includeSelf) const
</span><span class="lines">@@ -1541,7 +1541,7 @@
</span><span class="cx"> if (includeSelf == IncludeSelf && isComposited())
</span><span class="cx"> return const_cast<RenderLayer*>(this);
</span><span class="cx">
</span><del>- for (const RenderLayer* curr = compositingContainer(this); curr; curr = compositingContainer(curr)) {
</del><ins>+ for (const RenderLayer* curr = compositingContainer(*this); curr; curr = compositingContainer(*curr)) {
</ins><span class="cx"> if (curr->isComposited())
</span><span class="cx"> return const_cast<RenderLayer*>(curr);
</span><span class="cx"> }
</span><span class="lines">@@ -1551,11 +1551,11 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderLayer::enclosingCompositingLayerForRepaint(IncludeSelfOrNot includeSelf) const
</span><span class="cx"> {
</span><del>- if (includeSelf == IncludeSelf && isComposited() && !backing()->paintsIntoCompositedAncestor())
</del><ins>+ if (includeSelf == IncludeSelf && compositedWithOwnBackingStore(*this))
</ins><span class="cx"> return const_cast<RenderLayer*>(this);
</span><span class="cx">
</span><del>- for (const RenderLayer* curr = compositingContainer(this); curr; curr = compositingContainer(curr)) {
- if (compositedWithOwnBackingStore(curr))
</del><ins>+ for (const RenderLayer* curr = compositingContainer(*this); curr; curr = compositingContainer(*curr)) {
+ if (compositedWithOwnBackingStore(*curr))
</ins><span class="cx"> return const_cast<RenderLayer*>(curr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1576,7 +1576,7 @@
</span><span class="cx"> RenderLayer* RenderLayer::enclosingFilterRepaintLayer() const
</span><span class="cx"> {
</span><span class="cx"> for (const RenderLayer* curr = this; curr; curr = curr->parent()) {
</span><del>- if ((curr != this && curr->requiresFullLayerImageForFilters()) || compositedWithOwnBackingStore(curr) || curr->isRootLayer())
</del><ins>+ if ((curr != this && curr->requiresFullLayerImageForFilters()) || compositedWithOwnBackingStore(*curr) || curr->isRootLayer())
</ins><span class="cx"> return const_cast<RenderLayer*>(curr);
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1640,9 +1640,9 @@
</span><span class="cx"> if (current->isRootLayer())
</span><span class="cx"> return const_cast<RenderLayer*>(current);
</span><span class="cx">
</span><del>- current = compositingContainer(current);
</del><ins>+ current = compositingContainer(*current);
</ins><span class="cx"> ASSERT(current);
</span><del>- if (current->transform() || compositedWithOwnBackingStore(current))
</del><ins>+ if (current->transform() || compositedWithOwnBackingStore(*current))
</ins><span class="cx"> return const_cast<RenderLayer*>(current);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (189082 => 189083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2015-08-28 02:28:35 UTC (rev 189082)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2015-08-28 03:51:13 UTC (rev 189083)
</span><span class="lines">@@ -1184,7 +1184,7 @@
</span><span class="cx">
</span><span class="cx"> void makeMatrixRenderable(TransformationMatrix&, bool has3DRendering);
</span><span class="cx">
</span><del>-bool compositedWithOwnBackingStore(const RenderLayer*);
</del><ins>+bool compositedWithOwnBackingStore(const RenderLayer&);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (189082 => 189083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-08-28 02:28:35 UTC (rev 189082)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-08-28 03:51:13 UTC (rev 189083)
</span><span class="lines">@@ -1902,7 +1902,7 @@
</span><span class="cx"> size_t listSize = normalFlowList->size();
</span><span class="cx"> for (size_t i = 0; i < listSize; ++i) {
</span><span class="cx"> RenderLayer* curLayer = normalFlowList->at(i);
</span><del>- if (!compositedWithOwnBackingStore(curLayer)
</del><ins>+ if (!compositedWithOwnBackingStore(*curLayer)
</ins><span class="cx"> && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1917,7 +1917,7 @@
</span><span class="cx"> size_t listSize = negZOrderList->size();
</span><span class="cx"> for (size_t i = 0; i < listSize; ++i) {
</span><span class="cx"> RenderLayer* curLayer = negZOrderList->at(i);
</span><del>- if (!compositedWithOwnBackingStore(curLayer)
</del><ins>+ if (!compositedWithOwnBackingStore(*curLayer)
</ins><span class="cx"> && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1927,7 +1927,7 @@
</span><span class="cx"> size_t listSize = posZOrderList->size();
</span><span class="cx"> for (size_t i = 0; i < listSize; ++i) {
</span><span class="cx"> RenderLayer* curLayer = posZOrderList->at(i);
</span><del>- if (!compositedWithOwnBackingStore(curLayer)
</del><ins>+ if (!compositedWithOwnBackingStore(*curLayer)
</ins><span class="cx"> && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>