<!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>[170306] trunk</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/170306">170306</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-23 12:00:32 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding a mask on a simple color compositing layer removes the content
https://bugs.webkit.org/show_bug.cgi?id=134127
Reviewed by Dean Jackson.
Source/WebCore:
In <a href="http://trac.webkit.org/projects/webkit/changeset/169053">r169053</a> I moved some updateDrawsContent() into updateAfterDescendents(),
but this isn't called when a composited layer gains or loses a mask (which
doesn't cause a layout). This caused us to fail to allocate backing store
when gaining a mask, resulting in missing content.
Fix by calling updateAfterDescendents() from RenderLayer::styleChange()
when the layer config isn't changing.
Also remove a condition in isSimpleContainerCompositingLayer() that caused us
to fall off the simple layer path for masked layers, since this works just
fine.
Test: compositing/masks/solid-color-masked.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
LayoutTests:
* compositing/masks/mask-layer-size-expected.txt:
* compositing/masks/solid-color-masked-expected.html: Added.
* compositing/masks/solid-color-masked.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscompositingmasksmasklayersizeexpectedtxt">trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt</a></li>
<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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingmaskssolidcolormaskedexpectedhtml">trunk/LayoutTests/compositing/masks/solid-color-masked-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingmaskssolidcolormaskedhtml">trunk/LayoutTests/compositing/masks/solid-color-masked.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170305 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-23 19:00:30 UTC (rev 170305)
+++ trunk/LayoutTests/ChangeLog 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ Adding a mask on a simple color compositing layer removes the content
+ https://bugs.webkit.org/show_bug.cgi?id=134127
+
+ Reviewed by Dean Jackson.
+
+ * compositing/masks/mask-layer-size-expected.txt:
+ * compositing/masks/solid-color-masked-expected.html: Added.
+ * compositing/masks/solid-color-masked.html: Added.
+
</ins><span class="cx"> 2014-06-23 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Writing mode changes on the <html> and RenderView need to
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmasksmasklayersizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt (170305 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt 2014-06-23 19:00:30 UTC (rev 170305)
+++ trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> (position 10.00 10.00)
</span><span class="cx"> (bounds 400.00 200.00)
</span><span class="cx"> (contentsOpaque 1)
</span><del>- (drawsContent 1)
</del><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmaskssolidcolormaskedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/solid-color-masked-expected.html (0 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/solid-color-masked-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/solid-color-masked-expected.html 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ .masked {
+ -webkit-mask-image: linear-gradient(black, transparent);
+ }
+ </style>
+</head>
+<body>
+<div id="box" class="masked composited box">
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingmaskssolidcolormaskedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/solid-color-masked.html (0 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/solid-color-masked.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/solid-color-masked.html 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ .masked {
+ -webkit-mask-image: linear-gradient(black, transparent);
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+ function doTest()
+ {
+ window.setTimeout(function() {
+ document.getElementById('box').classList.add('masked');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div id="box" class="composited box">
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170305 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-23 19:00:30 UTC (rev 170305)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ Adding a mask on a simple color compositing layer removes the content
+ https://bugs.webkit.org/show_bug.cgi?id=134127
+
+ Reviewed by Dean Jackson.
+
+ In r169053 I moved some updateDrawsContent() into updateAfterDescendents(),
+ but this isn't called when a composited layer gains or loses a mask (which
+ doesn't cause a layout). This caused us to fail to allocate backing store
+ when gaining a mask, resulting in missing content.
+
+ Fix by calling updateAfterDescendents() from RenderLayer::styleChange()
+ when the layer config isn't changing.
+
+ Also remove a condition in isSimpleContainerCompositingLayer() that caused us
+ to fall off the simple layer path for masked layers, since this works just
+ fine.
+
+ Test: compositing/masks/solid-color-masked.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+
</ins><span class="cx"> 2014-06-23 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Writing mode changes on the <html> and RenderView need to
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170305 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-06-23 19:00:30 UTC (rev 170305)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -6395,8 +6395,11 @@
</span><span class="cx"> || needsCompositingLayersRebuiltForClip(oldStyle, &newStyle)
</span><span class="cx"> || needsCompositingLayersRebuiltForOverflow(oldStyle, &newStyle))
</span><span class="cx"> compositor().setCompositingLayersNeedRebuild();
</span><del>- else if (isComposited())
</del><ins>+ else if (isComposited()) {
+ // FIXME: updating geometry here is potentially harmful, because layout is not up-to-date.
</ins><span class="cx"> backing()->updateGeometry();
</span><ins>+ backing()->updateAfterDescendents();
+ }
</ins><span class="cx">
</span><span class="cx"> if (oldStyle) {
</span><span class="cx"> // Compositing layers keep track of whether they are clipped by any of the ancestors.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (170305 => 170306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-06-23 19:00:30 UTC (rev 170305)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-06-23 19:00:32 UTC (rev 170306)
</span><span class="lines">@@ -1703,9 +1703,6 @@
</span><span class="cx"> // This is a useful optimization, because it allows us to avoid allocating backing store.
</span><span class="cx"> bool RenderLayerBacking::isSimpleContainerCompositingLayer() const
</span><span class="cx"> {
</span><del>- if (renderer().hasMask()) // masks require special treatment
- return false;
-
</del><span class="cx"> if (renderer().isReplaced() && (!isCompositedPlugin(&renderer()) || isRestartedPlugin(&renderer())))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>