<!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>[184371] 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/184371">184371</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 21:43:05 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/183794">r183794</a>): Garbage tiles when body background switches to fixed
https://bugs.webkit.org/show_bug.cgi?id=145032
rdar://problem/20963679
Reviewed by Dean Jackson.
Source/WebCore:
After <a href="http://trac.webkit.org/projects/webkit/changeset/183794">r183794</a> (or possibly an earlier commit), we failed to dynamically update
the configuration of layers that handled fixed background attachment on the root.
This would result in unpainted tiles, and non-fixed-background behavior.
Fix by calling RenderLayerCompositor::rootOrBodyStyleChanged() whenever the
style changes on the root or body renderers, and triggering a compositing update
if the fixedness of the background changes. It calls the existing rootBackgroundTransparencyChanged()
if the color changes.
Test: platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::styleDidChange):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::rootOrBodyStyleChanged):
(WebCore::RenderLayerCompositor::rootBackgroundTransparencyChanged):
* rendering/RenderLayerCompositor.h:
LayoutTests:
Test that toggles the attachment of the body background to fixed, then dumps layers.
* platform/mac-wk2/tiled-drawing/toggle-to-fixed-background-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingtoggletofixedbackgroundexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingtoggletofixedbackgroundhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184370 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-15 04:39:51 UTC (rev 184370)
+++ trunk/LayoutTests/ChangeLog 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-14 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r183794): Garbage tiles when body background switches to fixed
+ https://bugs.webkit.org/show_bug.cgi?id=145032
+ rdar://problem/20963679
+
+ Reviewed by Dean Jackson.
+
+ Test that toggles the attachment of the body background to fixed, then dumps layers.
+
+ * platform/mac-wk2/tiled-drawing/toggle-to-fixed-background-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html: Added.
+
</ins><span class="cx"> 2015-05-13 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingtoggletofixedbackgroundexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background-expected.txt (0 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background-expected.txt 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+Toggling to a fixed background on the body should make a layer for the background.
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 5024.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 785.00 5024.00)
+ (children 2
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 600.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (backgroundColor #FFFFFF)
+ )
+ (GraphicsLayer
+ (bounds 785.00 5024.00)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 50.00)
+ (bounds 100.00 100.00)
+ (contentsOpaque 1)
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingtoggletofixedbackgroundhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html (0 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ background-image: linear-gradient(to top, blue, white);
+ height: 5000px;
+ }
+
+ body.fixed {
+ background-attachment: fixed;
+ }
+
+ #layers {
+ margin: 100px;
+ background-color: silver;
+ }
+
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ }
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function documentLoaded()
+ {
+ window.setTimeout(doTest, 0);
+ }
+
+ function doTest()
+ {
+ document.body.classList.add('fixed');
+
+ if (window.internals)
+ document.getElementById('layers').textContent = window.internals.layerTreeAsText(document);
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ window.addEventListener('load', documentLoaded, false);
+ </script>
+</head>
+<body>
+
+<p>Toggling to a fixed background on the body should make a layer for the background.</p>
+<div class="composited box">
+
+</div>
+<pre id="layers"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184370 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-15 04:39:51 UTC (rev 184370)
+++ trunk/Source/WebCore/ChangeLog 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-05-14 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r183794): Garbage tiles when body background switches to fixed
+ https://bugs.webkit.org/show_bug.cgi?id=145032
+ rdar://problem/20963679
+
+ Reviewed by Dean Jackson.
+
+ After r183794 (or possibly an earlier commit), we failed to dynamically update
+ the configuration of layers that handled fixed background attachment on the root.
+
+ This would result in unpainted tiles, and non-fixed-background behavior.
+
+ Fix by calling RenderLayerCompositor::rootOrBodyStyleChanged() whenever the
+ style changes on the root or body renderers, and triggering a compositing update
+ if the fixedness of the background changes. It calls the existing rootBackgroundTransparencyChanged()
+ if the color changes.
+
+ Test: platform/mac-wk2/tiled-drawing/toggle-to-fixed-background.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::styleDidChange):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::rootOrBodyStyleChanged):
+ (WebCore::RenderLayerCompositor::rootBackgroundTransparencyChanged):
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2015-05-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r184359 and r184362.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (184370 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-15 04:39:51 UTC (rev 184370)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx"> downcast<RenderBlockFlow>(*rootRenderer).updateStylesForColumnChildren();
</span><span class="cx">
</span><span class="cx"> if (diff != StyleDifferenceEqual)
</span><del>- view().compositor().rootBackgroundTransparencyChanged();
</del><ins>+ view().compositor().rootOrBodyStyleChanged(*this, oldStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (184370 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-05-15 04:39:51 UTC (rev 184370)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -3166,17 +3166,38 @@
</span><span class="cx"> return documentBackgroundColor.hasAlpha();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// We can't rely on getting layerStyleChanged() for a style change that affects the root background, because the style change may
+// be on the body which has no RenderLayer.
+void RenderLayerCompositor::rootOrBodyStyleChanged(RenderElement& renderer, const RenderStyle* oldStyle)
+{
+ if (!inCompositingMode())
+ return;
+
+ Color oldBackgroundColor;
+ if (oldStyle)
+ oldBackgroundColor = oldStyle->visitedDependentColor(CSSPropertyBackgroundColor);
+
+ if (oldBackgroundColor != renderer.style().visitedDependentColor(CSSPropertyBackgroundColor))
+ rootBackgroundTransparencyChanged();
+
+ bool hadFixedBackground = oldStyle && oldStyle->hasEntirelyFixedBackground();
+ if (hadFixedBackground != renderer.hasEntirelyFixedBackground()) {
+ setCompositingLayersNeedRebuild();
+ scheduleCompositingLayerUpdate();
+ }
+}
+
</ins><span class="cx"> void RenderLayerCompositor::rootBackgroundTransparencyChanged()
</span><span class="cx"> {
</span><span class="cx"> if (!inCompositingMode())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Color documentBackgroundColor = m_renderView.frameView().documentBackgroundColor();
</span><del>- if (m_lastDocumentBackgroundColor.isValid() && documentBackgroundColor.hasAlpha() == m_lastDocumentBackgroundColor.hasAlpha())
</del><ins>+ Color lastDocumentBackgroundColor = m_lastDocumentBackgroundColor;
+ m_lastDocumentBackgroundColor = documentBackgroundColor;
+ if (lastDocumentBackgroundColor.isValid() && lastDocumentBackgroundColor.hasAlpha() == documentBackgroundColor.hasAlpha())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_lastDocumentBackgroundColor = documentBackgroundColor;
-
</del><span class="cx"> // FIXME: We should do something less expensive than a full layer rebuild.
</span><span class="cx"> setCompositingLayersNeedRebuild();
</span><span class="cx"> scheduleCompositingLayerUpdate();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (184370 => 184371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-05-15 04:39:51 UTC (rev 184370)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-05-15 04:43:05 UTC (rev 184371)
</span><span class="lines">@@ -164,7 +164,9 @@
</span><span class="cx"> bool supportsFixedRootBackgroundCompositing() const;
</span><span class="cx"> bool needsFixedRootBackgroundLayer(const RenderLayer&) const;
</span><span class="cx"> GraphicsLayer* fixedRootBackgroundLayer() const;
</span><del>-
</del><ins>+
+ void rootOrBodyStyleChanged(RenderElement&, const RenderStyle* oldStyle);
+
</ins><span class="cx"> // Called after the view transparency, or the document or base background color change.
</span><span class="cx"> void rootBackgroundTransparencyChanged();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>