<!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>[184430] 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/184430">184430</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-05-15 21:24:48 -0700 (Fri, 15 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/183300">r183300</a>): Background missing on top links on apple.com
https://bugs.webkit.org/show_bug.cgi?id=145079
rdar://problem/20914252
Reviewed by Tim Horton.
Source/WebCore:
Re-land <a href="http://trac.webkit.org/projects/webkit/changeset/184421">r184421</a> with a fix to check against rects.coverageRect
rather than the stale m_coverageRect.
Test: compositing/visible-rect/backing-change-height-from-zero.html
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::shouldSkipLayerInDump):
LayoutTests:
Re-land.
* compositing/visible-rect/backing-change-height-from-zero-expected.txt: Added.
* compositing/visible-rect/backing-change-height-from-zero.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="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingvisiblerectbackingchangeheightfromzeroexpectedtxt">trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingvisiblerectbackingchangeheightfromzerohtml">trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184429 => 184430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-16 03:47:09 UTC (rev 184429)
+++ trunk/LayoutTests/ChangeLog 2015-05-16 04:24:48 UTC (rev 184430)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-15 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r183300): Background missing on top links on apple.com
+ https://bugs.webkit.org/show_bug.cgi?id=145079
+ rdar://problem/20914252
+
+ Reviewed by Tim Horton.
+
+ Re-land.
+
+ * compositing/visible-rect/backing-change-height-from-zero-expected.txt: Added.
+ * compositing/visible-rect/backing-change-height-from-zero.html: Added.
+
</ins><span class="cx"> 2015-05-15 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test the interaction between font-family and font-weight
</span></span></pre></div>
<a id="trunkLayoutTestscompositingvisiblerectbackingchangeheightfromzeroexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt (0 => 184430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt 2015-05-16 04:24:48 UTC (rev 184430)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+Content
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (visible rect 0.00, 0.00 800.00 x 600.00)
+ (coverage rect 0.00, 0.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 0.00 800.00 x 600.00)
+ (coverage rect 0.00, 0.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (position 28.00 20.00)
+ (bounds 100.00 100.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 100.00 x 100.00)
+ (coverage rect -28.00, -20.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingvisiblerectbackingchangeheightfromzerohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html (0 => 184430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html (rev 0)
+++ trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html 2015-05-16 04:24:48 UTC (rev 184430)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <style>
+ .box {
+ margin: 20px;
+ width: 100px;
+ height: 0px;
+ overflow: hidden;
+ background-color: blue;
+ -webkit-transform: translateZ(0);
+ }
+
+ .box.changed {
+ height: 100px;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ document.body.offsetWidth;
+
+ document.getElementById('box').classList.add('changed');
+
+ if (window.internals)
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS)
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+
+ }, 0);
+
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+
+</head>
+<body>
+ <div id="box" class="box">Content</div>
+<pre id="layers">Layer tree goes here when testing</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184429 => 184430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-16 03:47:09 UTC (rev 184429)
+++ trunk/Source/WebCore/ChangeLog 2015-05-16 04:24:48 UTC (rev 184430)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-15 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r183300): Background missing on top links on apple.com
+ https://bugs.webkit.org/show_bug.cgi?id=145079
+ rdar://problem/20914252
+
+ Reviewed by Tim Horton.
+
+ Re-land r184421 with a fix to check against rects.coverageRect
+ rather than the stale m_coverageRect.
+
+ Test: compositing/visible-rect/backing-change-height-from-zero.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::shouldSkipLayerInDump):
+
</ins><span class="cx"> 2015-05-15 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: REGRESSION (r181625): Timeline recording started from console.profile is always empty
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (184429 => 184430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-16 03:47:09 UTC (rev 184429)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-16 04:24:48 UTC (rev 184430)
</span><span class="lines">@@ -1260,10 +1260,17 @@
</span><span class="cx"> if (!visibleRectChanged && !coverageRectChanged)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // FIXME: we need to take reflections into account when determining whether this layer intersects the coverage rect.
+ bool intersectsCoverageRect = !allowBackingStoreDetachment || rects.coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
+ if (intersectsCoverageRect != m_intersectsCoverageRect) {
+ m_uncommittedChanges |= CoverageRectChanged;
+ m_intersectsCoverageRect = intersectsCoverageRect;
+ }
+
</ins><span class="cx"> if (visibleRectChanged) {
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_visibleRect = rects.visibleRect;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
</span><span class="cx"> // FIXME: this assumes that the mask layer has the same geometry as this layer (which is currently always true).
</span><span class="cx"> maskLayer->m_uncommittedChanges |= CoverageRectChanged;
</span><span class="lines">@@ -1275,9 +1282,6 @@
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_coverageRect = rects.coverageRect;
</span><span class="cx">
</span><del>- // FIXME: we need to take reflections into account when determining whether this layer intersects the coverage rect.
- m_intersectsCoverageRect = !allowBackingStoreDetachment || m_coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
-
</del><span class="cx"> if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
</span><span class="cx"> maskLayer->m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> maskLayer->m_coverageRect = rects.coverageRect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (184429 => 184430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-05-16 03:47:09 UTC (rev 184429)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-05-16 04:24:48 UTC (rev 184430)
</span><span class="lines">@@ -2393,8 +2393,11 @@
</span><span class="cx"> return static_cast<GraphicsLayerClient&>(compositor()).isTrackingRepaints();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerBacking::shouldSkipLayerInDump(const GraphicsLayer* layer, LayerTreeAsTextBehavior) const
</del><ins>+bool RenderLayerBacking::shouldSkipLayerInDump(const GraphicsLayer* layer, LayerTreeAsTextBehavior behavior) const
</ins><span class="cx"> {
</span><ins>+ if (behavior & LayerTreeAsTextDebug)
+ return false;
+
</ins><span class="cx"> // Skip the root tile cache's flattening layer.
</span><span class="cx"> return m_isMainFrameRenderViewLayer && layer && layer == m_childContainmentLayer.get();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>