<!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>[176291] 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/176291">176291</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-11-18 15:07:28 -0800 (Tue, 18 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175656">r175656</a>. rdar://problem/18978402</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="#branchessafari6003branchSourceWebCorerenderingRenderLayerh">branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingRenderObjectcpp">branches/safari-600.3-branch/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestscompositingbackingnobackingforopacity0childexpectedtxt">branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child-expected.txt</a></li>
<li><a href="#branchessafari6003branchLayoutTestscompositingbackingnobackingforopacity0childhtml">branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child.html</a></li>
<li><a href="#branchessafari6003branchLayoutTestscompositingbackingtoggleopacity0childexpectedtxt">branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child-expected.txt</a></li>
<li><a href="#branchessafari6003branchLayoutTestscompositingbackingtoggleopacity0childhtml">branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child.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 (176290 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-11-18 23:06:00 UTC (rev 176290)
+++ branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-05 Simon Fraser <simon.fraser@apple.com>
+
+ Avoid backing store for opacity:0 descendant layers
+ https://bugs.webkit.org/show_bug.cgi?id=138448
+
+ Reviewed by Dean Jackson.
+
+ Test for no backing store with opacity:0 child, and that we get backing
+ store when dynamically changing the opacity to non-0.
+
+ * compositing/backing/no-backing-for-opacity-0-child-expected.txt: Added.
+ * compositing/backing/no-backing-for-opacity-0-child.html: Added.
+ * compositing/backing/toggle-opacity-0-child-expected.txt: Added.
+ * compositing/backing/toggle-opacity-0-child.html: Added.
+
</ins><span class="cx"> 2014-11-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge missing layout tests which were added to trunk in r175197.
</span></span></pre></div>
<a id="branchessafari6003branchLayoutTestscompositingbackingnobackingforopacity0childexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child-expected.txt (0 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child-expected.txt (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child-expected.txt 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 18.00 10.00)
+ (anchor 0.40 0.40)
+ (bounds 125.00 125.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari6003branchLayoutTestscompositingbackingnobackingforopacity0childhtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child.html (0 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child.html (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/compositing/backing/no-backing-for-opacity-0-child.html 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ position: relative;
+ height: 100px;
+ width: 100px;
+ margin: 10px;
+ left: 0;
+ top: 0;
+ }
+
+ .clipping {
+ position: absolute;
+ overflow: hidden;
+ left: 20px;
+ top: 20px;
+ height: 100px;
+ width: 300px;
+ z-index: 0;
+ background-color: green;
+ }
+
+ .box {
+ position: absolute;
+ top: 75px;
+ left: 75px;
+ width: 50px;
+ height: 50px;
+ background-color: black;
+ }
+
+ .child {
+ opacity: 0;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+ </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 box">
+ </div>
+ </div>
+ </div>
+
+<pre id="layers">Layer tree goes here in DRT</pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6003branchLayoutTestscompositingbackingtoggleopacity0childexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child-expected.txt (0 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child-expected.txt (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child-expected.txt 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 18.00 10.00)
+ (anchor 0.40 0.40)
+ (bounds 125.00 125.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari6003branchLayoutTestscompositingbackingtoggleopacity0childhtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child.html (0 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child.html (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/compositing/backing/toggle-opacity-0-child.html 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ position: relative;
+ height: 100px;
+ width: 100px;
+ margin: 10px;
+ left: 0;
+ top: 0;
+ }
+
+ .clipping {
+ position: absolute;
+ overflow: hidden;
+ left: 20px;
+ top: 20px;
+ height: 100px;
+ width: 300px;
+ z-index: 0;
+ background-color: green;
+ }
+
+ .box {
+ position: absolute;
+ top: 75px;
+ left: 75px;
+ width: 50px;
+ height: 50px;
+ background-color: black;
+ }
+
+ .child {
+ opacity: 0;
+ }
+
+ .child.changed {
+ opacity: 0.5;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+ </style>
+
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ document.getElementById('child').classList.add('changed');
+ dumpLayers();
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function dumpLayers()
+ {
+ var layersResult = document.getElementById('layers');
+ if (window.testRunner)
+ layersResult.innerText = window.internals.layerTreeAsText(document);
+ }
+
+ window.addEventListener('load', doTest, false)
+ </script>
+
+</head>
+<body>
+
+ <div class="composited container">
+ <div id="child" class="child box">
+ </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 (176290 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-18 23:06:00 UTC (rev 176290)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-11-05 Simon Fraser <simon.fraser@apple.com>
+
+ Avoid backing store for opacity:0 descendant layers
+ https://bugs.webkit.org/show_bug.cgi?id=138448
+
+ Reviewed by Dean Jackson.
+
+ If a composited layer has no rendered content but a painting zero-opacity descendant
+ layer, than we can avoid making backing store.
+
+ When the opacity on such a child changes, we need to trigger a tree rebuild
+ to force the backing store to come back (this could be optimized later).
+
+ Tests: compositing/backing/no-backing-for-opacity-0-child.html
+ compositing/backing/toggle-opacity-0-child.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::styleChangeRequiresLayerRebuild):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::containerForRepaint):
+
</ins><span class="cx"> 2014-11-18 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176166. rdar://problem/18953982
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp (176290 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp 2014-11-18 23:06:00 UTC (rev 176290)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -6276,7 +6276,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_visibleDescendantStatusDirty);
</span><span class="cx">
</span><del>- if (!hasVisibleContent())
</del><ins>+ if (!hasVisibleContent() || !renderer().style().opacity())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (renderer().isRenderReplaced() || hasOverflowControls())
</span><span class="lines">@@ -6421,6 +6421,21 @@
</span><span class="cx"> return !isComposited() && oldStyle && (oldStyle->overflowX() != newStyle->overflowX()) && stackingContainer()->hasCompositingDescendant();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool RenderLayer::needsCompositingLayersRebuiltForOpacity(const RenderStyle* oldStyle, const RenderStyle* newStyle) const
+{
+ if (!oldStyle || !newStyle)
+ return false;
+
+ if (!oldStyle->opacity() != !newStyle->opacity()) {
+ RenderLayerModelObject* repaintContainer = renderer().containerForRepaint();
+ if (RenderLayerBacking* ancestorBacking = repaintContainer->layer()->backing()) {
+ if (newStyle->opacity() != ancestorBacking->graphicsLayer()->drawsContent())
+ return true;
+ }
+ }
+ return false;
+}
+
</ins><span class="cx"> void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><span class="cx"> bool isNormalFlowOnly = shouldBeNormalFlowOnly();
</span><span class="lines">@@ -6480,7 +6495,8 @@
</span><span class="cx"> const RenderStyle& newStyle = renderer().style();
</span><span class="cx"> if (compositor().updateLayerCompositingState(*this)
</span><span class="cx"> || needsCompositingLayersRebuiltForClip(oldStyle, &newStyle)
</span><del>- || needsCompositingLayersRebuiltForOverflow(oldStyle, &newStyle))
</del><ins>+ || needsCompositingLayersRebuiltForOverflow(oldStyle, &newStyle)
+ || needsCompositingLayersRebuiltForOpacity(oldStyle, &newStyle))
</ins><span class="cx"> compositor().setCompositingLayersNeedRebuild();
</span><span class="cx"> else if (isComposited()) {
</span><span class="cx"> // FIXME: updating geometry here is potentially harmful, because layout is not up-to-date.
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.h (176290 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.h 2014-11-18 23:06:00 UTC (rev 176290)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.h 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -831,6 +831,7 @@
</span><span class="cx"> bool needsCompositedScrolling() const;
</span><span class="cx"> bool needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const;
</span><span class="cx"> bool needsCompositingLayersRebuiltForOverflow(const RenderStyle* oldStyle, const RenderStyle* newStyle) const;
</span><ins>+ bool needsCompositingLayersRebuiltForOpacity(const RenderStyle* oldStyle, const RenderStyle* newStyle) const;
</ins><span class="cx">
</span><span class="cx"> bool paintsWithTransparency(PaintBehavior paintBehavior) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderObject.cpp (176290 => 176291)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderObject.cpp 2014-11-18 23:06:00 UTC (rev 176290)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderObject.cpp 2014-11-18 23:07:28 UTC (rev 176291)
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx">
</span><span class="cx"> RenderLayerModelObject* RenderObject::containerForRepaint() const
</span><span class="cx"> {
</span><del>- RenderLayerModelObject* repaintContainer = 0;
</del><ins>+ RenderLayerModelObject* repaintContainer = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (view().usesCompositing()) {
</span><span class="cx"> if (RenderLayer* parentLayer = enclosingLayer()) {
</span></span></pre>
</div>
</div>
</body>
</html>