<!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>[175272] branches/safari-600.3-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/175272">175272</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 14:42:27 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173181">r173181</a>. rdar://problem/18428697</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestsChangeLog">branches/safari-600.3-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingRenderLayercpp">branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestscompositingbackingchildlayernobackingexpectedtxt">branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing-expected.txt</a></li>
<li><a href="#branchessafari6003branchLayoutTestscompositingbackingchildlayernobackinghtml">branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/LayoutTests/ChangeLog (175271 => 175272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-10-28 20:12:00 UTC (rev 175271)
+++ branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-10-28 21:42:27 UTC (rev 175272)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-28 Dana Burkart <dburkart@apple.com>
+
+ Merge r173181
+
+ 2014-09-02 Simon Fraser <simon.fraser@apple.com>
+
+ Non-composited child RenderLayers cause allocation of unncessary backing store
+ https://bugs.webkit.org/show_bug.cgi?id=136375
+
+ Reviewed by David Hyatt.
+
+ Test with a composited div with various configurations of non-composited child layers.
+
+ * compositing/backing/child-layer-no-backing-expected.txt: Added.
+ * compositing/backing/child-layer-no-backing.html: Added.
+
</ins><span class="cx"> 2014-10-21 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r173246
</span></span></pre></div>
<a id="branchessafari6003branchLayoutTestscompositingbackingchildlayernobackingexpectedtxtfromrev173181trunkLayoutTestscompositingbackingchildlayernobackingexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing-expected.txt (from rev 173181, trunk/LayoutTests/compositing/backing/child-layer-no-backing-expected.txt) (0 => 175272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing-expected.txt (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing-expected.txt 2014-10-28 21:42:27 UTC (rev 175272)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+Grandchild content
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 1091.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 785.00 1091.00)
+ (contentsOpaque 1)
+ (children 5
+ (GraphicsLayer
+ (position 18.00 10.00)
+ (bounds 200.00 200.00)
+ )
+ (GraphicsLayer
+ (position 18.00 220.00)
+ (bounds 200.00 200.00)
+ )
+ (GraphicsLayer
+ (position 18.00 430.00)
+ (bounds 200.00 200.00)
+ )
+ (GraphicsLayer
+ (position 18.00 640.00)
+ (anchor 0.50 0.46)
+ (bounds 200.00 218.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 18.00 850.00)
+ (anchor 0.50 0.50)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari6003branchLayoutTestscompositingbackingchildlayernobackinghtmlfromrev173181trunkLayoutTestscompositingbackingchildlayernobackinghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing.html (from rev 173181, trunk/LayoutTests/compositing/backing/child-layer-no-backing.html) (0 => 175272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing.html (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/compositing/backing/child-layer-no-backing.html 2014-10-28 21:42:27 UTC (rev 175272)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ height: 200px;
+ width: 200px;
+ margin: 10px;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ .child {
+ position: relative;
+ height: 100%;
+ width: 100%;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function dumpLayers()
+ {
+ var layersResult = document.getElementById('layers');
+ if (window.testRunner)
+ layersResult.innerText = window.internals.layerTreeAsText(document);
+ }
+
+ window.addEventListener('load', dumpLayers, false)
+ </script>
+</head>
+<body>
+ <div class="composited container">
+ <div class="child">
+ </div>
+ </div>
+
+ <div class="composited container">
+ <div class="child">
+ <div class="child">
+ </div>
+ </div>
+ </div>
+
+ <div class="composited container">
+ <div class="child" style="visibility:hidden">
+ Child content
+ </div>
+ </div>
+
+ <div class="composited container">
+ <div class="child" style="visibility:hidden">
+ Child content
+ <div class="child" style="visibility:visible">
+ Grandchild content
+ </div>
+ </div>
+ </div>
+
+ <div class="composited container">
+ <div class="child" style="visibility:hidden">
+ <div class="child" style="visibility:visible; border: 1px solid black">
+ </div>
+ </div>
+ </div>
+
+<pre id="layers">Layer tree goes here in DRT</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175271 => 175272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-28 20:12:00 UTC (rev 175271)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-28 21:42:27 UTC (rev 175272)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-28 Dana Burkart <dburkart@apple.com>
+
+ Merge r173181
+
+ 2014-09-02 Simon Fraser <simon.fraser@apple.com>
+
+ Non-composited child RenderLayers cause allocation of unncessary backing store
+ https://bugs.webkit.org/show_bug.cgi?id=136375
+
+ Reviewed by David Hyatt.
+
+ A composited element that has non-composited descendant elements that fall into
+ RenderLayers was getting backing store when none was required. descendentLayerPaintsIntoAncestor()
+ was simply checking the "visibility:visible" bit on descendant non-composited layers,
+ instead of actually asking them if they have any visual content.
+
+ Added a couple of FIXME comments.
+
+ Test: compositing/backing/child-layer-no-backing.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::descendentLayerPaintsIntoAncestor):
+
</ins><span class="cx"> 2014-10-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r174908. <rdar://problem/18694470>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp (175271 => 175272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp 2014-10-28 20:12:00 UTC (rev 175271)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp 2014-10-28 21:42:27 UTC (rev 175272)
</span><span class="lines">@@ -6245,6 +6245,7 @@
</span><span class="cx"> if (hasVisibleContent() && hasNonEmptyChildRenderers())
</span><span class="cx"> return true;
</span><span class="cx">
</span><ins>+ // FIXME: a visibility:hidden replaced element should return false here.
</ins><span class="cx"> if (renderer().isReplaced() || renderer().hasMask())
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (175271 => 175272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-10-28 20:12:00 UTC (rev 175271)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-10-28 21:42:27 UTC (rev 175272)
</span><span class="lines">@@ -1503,6 +1503,7 @@
</span><span class="cx"> return finalOpacity;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: Code is duplicated in RenderLayer. Also, we should probably not consider filters a box decoration here.
</ins><span class="cx"> static inline bool hasBoxDecorations(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> return style.hasBorder() || style.hasBorderRadius() || style.hasOutline() || style.hasAppearance() || style.boxShadow() || style.hasFilter();
</span><span class="lines">@@ -1754,7 +1755,7 @@
</span><span class="cx"> for (size_t i = 0; i < listSize; ++i) {
</span><span class="cx"> RenderLayer* curLayer = normalFlowList->at(i);
</span><span class="cx"> if (!compositedWithOwnBackingStore(curLayer)
</span><del>- && (curLayer->hasVisibleContent() || descendentLayerPaintsIntoAncestor(*curLayer)))
</del><ins>+ && (curLayer->isVisuallyNonEmpty() || descendentLayerPaintsIntoAncestor(*curLayer)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1769,7 +1770,7 @@
</span><span class="cx"> for (size_t i = 0; i < listSize; ++i) {
</span><span class="cx"> RenderLayer* curLayer = negZOrderList->at(i);
</span><span class="cx"> if (!compositedWithOwnBackingStore(curLayer)
</span><del>- && (curLayer->hasVisibleContent() || descendentLayerPaintsIntoAncestor(*curLayer)))
</del><ins>+ && (curLayer->isVisuallyNonEmpty() || descendentLayerPaintsIntoAncestor(*curLayer)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1779,7 +1780,7 @@
</span><span class="cx"> for (size_t i = 0; i < listSize; ++i) {
</span><span class="cx"> RenderLayer* curLayer = posZOrderList->at(i);
</span><span class="cx"> if (!compositedWithOwnBackingStore(curLayer)
</span><del>- && (curLayer->hasVisibleContent() || descendentLayerPaintsIntoAncestor(*curLayer)))
</del><ins>+ && (curLayer->isVisuallyNonEmpty() || descendentLayerPaintsIntoAncestor(*curLayer)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>