<!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>[170203] 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/170203">170203</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 13:56:16 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/169972">r169972</a>): fix issue when removing masks from compositing layers
https://bugs.webkit.org/show_bug.cgi?id=134118
<rdar://problem/17366654>
Reviewed by Dean Jackson.
Source/WebCore:
After <a href="http://trac.webkit.org/projects/webkit/changeset/169972">r169972</a> when removing the mask, we could destroy the mask
layer before the call into m_graphicsLayer->setMaskLayer(), which would
try to call functions on the old mask. Fix by clearing the mask layer
on the GraphicsLayer before the mask layer gets destroyed.
Test: compositing/masks/toggle-mask.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateConfiguration):
(WebCore::RenderLayerBacking::updateMaskLayer):
* rendering/RenderLayerBacking.h:
LayoutTests:
Test that toggles the mask on a composited element.
* compositing/masks/toggle-mask-expected.txt: Added.
* compositing/masks/toggle-mask.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingmaskstogglemaskexpectedtxt">trunk/LayoutTests/compositing/masks/toggle-mask-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingmaskstogglemaskhtml">trunk/LayoutTests/compositing/masks/toggle-mask.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170202 => 170203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-20 20:54:57 UTC (rev 170202)
+++ trunk/LayoutTests/ChangeLog 2014-06-20 20:56:16 UTC (rev 170203)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-20 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r169972): fix issue when removing masks from compositing layers
+ https://bugs.webkit.org/show_bug.cgi?id=134118
+ <rdar://problem/17366654>
+
+ Reviewed by Dean Jackson.
+
+ Test that toggles the mask on a composited element.
+
+ * compositing/masks/toggle-mask-expected.txt: Added.
+ * compositing/masks/toggle-mask.html: Added.
+
</ins><span class="cx"> 2014-06-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Make -webkit-overflow-scrolling:touch work in iframes (breaks MSWord previews)
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmaskstogglemaskexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/toggle-mask-expected.txt (0 => 170203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/toggle-mask-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/masks/toggle-mask-expected.txt 2014-06-20 20:56:16 UTC (rev 170203)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test should not crash when run with MallocScribble
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingmaskstogglemaskhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/toggle-mask.html (0 => 170203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/toggle-mask.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/toggle-mask.html 2014-06-20 20:56:16 UTC (rev 170203)
</span><span class="lines">@@ -0,0 +1,43 @@
</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.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ var count = 0;
+ function doTest()
+ {
+ window.setInterval(function() {
+ document.getElementById('box').classList.toggle('masked');
+ if (++count == 4 && window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <p>This test should not crash when run with MallocScribble</p>
+ <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 (170202 => 170203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-20 20:54:57 UTC (rev 170202)
+++ trunk/Source/WebCore/ChangeLog 2014-06-20 20:56:16 UTC (rev 170203)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-06-20 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r169972): fix issue when removing masks from compositing layers
+ https://bugs.webkit.org/show_bug.cgi?id=134118
+ <rdar://problem/17366654>
+
+ Reviewed by Dean Jackson.
+
+ After r169972 when removing the mask, we could destroy the mask
+ layer before the call into m_graphicsLayer->setMaskLayer(), which would
+ try to call functions on the old mask. Fix by clearing the mask layer
+ on the GraphicsLayer before the mask layer gets destroyed.
+
+ Test: compositing/masks/toggle-mask.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ (WebCore::RenderLayerBacking::updateMaskLayer):
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2014-06-20 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Release freed up blocks from the JS heap after simulated memory pressure.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (170202 => 170203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-06-20 20:54:57 UTC (rev 170202)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-06-20 20:56:16 UTC (rev 170203)
</span><span class="lines">@@ -563,8 +563,7 @@
</span><span class="cx"> m_graphicsLayer->addChild(flatteningLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (updateMaskLayer(renderer().hasMask()))
- m_graphicsLayer->setMaskLayer(m_maskLayer.get());
</del><ins>+ updateMaskLayer(renderer().hasMask());
</ins><span class="cx">
</span><span class="cx"> if (m_owningLayer.hasReflection()) {
</span><span class="cx"> if (m_owningLayer.reflectionLayer()->backing()) {
</span><span class="lines">@@ -1385,7 +1384,7 @@
</span><span class="cx"> return layerChanged;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerBacking::updateMaskLayer(bool needsMaskLayer)
</del><ins>+void RenderLayerBacking::updateMaskLayer(bool needsMaskLayer)
</ins><span class="cx"> {
</span><span class="cx"> bool layerChanged = false;
</span><span class="cx"> if (needsMaskLayer) {
</span><span class="lines">@@ -1394,8 +1393,10 @@
</span><span class="cx"> m_maskLayer->setDrawsContent(true);
</span><span class="cx"> m_maskLayer->setPaintingPhase(GraphicsLayerPaintMask);
</span><span class="cx"> layerChanged = true;
</span><ins>+ m_graphicsLayer->setMaskLayer(m_maskLayer.get());
</ins><span class="cx"> }
</span><span class="cx"> } else if (m_maskLayer) {
</span><ins>+ m_graphicsLayer->setMaskLayer(nullptr);
</ins><span class="cx"> willDestroyLayer(m_maskLayer.get());
</span><span class="cx"> m_maskLayer = nullptr;
</span><span class="cx"> layerChanged = true;
</span><span class="lines">@@ -1403,8 +1404,6 @@
</span><span class="cx">
</span><span class="cx"> if (layerChanged)
</span><span class="cx"> m_graphicsLayer->setPaintingPhase(paintingPhaseForPrimaryLayer());
</span><del>-
- return layerChanged;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerBacking::updateScrollingLayers(bool needsScrollingLayers)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (170202 => 170203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-06-20 20:54:57 UTC (rev 170202)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-06-20 20:56:16 UTC (rev 170203)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> bool updateOverflowControlsLayers(bool needsHorizontalScrollbarLayer, bool needsVerticalScrollbarLayer, bool needsScrollCornerLayer);
</span><span class="cx"> bool updateForegroundLayer(bool needsForegroundLayer);
</span><span class="cx"> bool updateBackgroundLayer(bool needsBackgroundLayer);
</span><del>- bool updateMaskLayer(bool needsMaskLayer);
</del><ins>+ void updateMaskLayer(bool needsMaskLayer);
</ins><span class="cx"> bool requiresHorizontalScrollbarLayer() const;
</span><span class="cx"> bool requiresVerticalScrollbarLayer() const;
</span><span class="cx"> bool requiresScrollCornerLayer() const;
</span></span></pre>
</div>
</div>
</body>
</html>