Diff
Modified: trunk/LayoutTests/ChangeLog (184422 => 184423)
--- trunk/LayoutTests/ChangeLog 2015-05-16 00:21:46 UTC (rev 184422)
+++ trunk/LayoutTests/ChangeLog 2015-05-16 01:37:26 UTC (rev 184423)
@@ -1,3 +1,18 @@
+2015-05-15 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r184421.
+ https://bugs.webkit.org/show_bug.cgi?id=145087
+
+ Introduced 42 layout test failures (Requested by rniwa on
+ #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r183300): Background missing on top links on
+ apple.com"
+ https://bugs.webkit.org/show_bug.cgi?id=145079
+ http://trac.webkit.org/changeset/184421
+
2015-05-15 Simon Fraser <[email protected]>
REGRESSION (r183300): Background missing on top links on apple.com
Deleted: trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt (184422 => 184423)
--- trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt 2015-05-16 00:21:46 UTC (rev 184422)
+++ trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt 2015-05-16 01:37:26 UTC (rev 184423)
@@ -1,32 +0,0 @@
-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)
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html (184422 => 184423)
--- trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html 2015-05-16 00:21:46 UTC (rev 184422)
+++ trunk/LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html 2015-05-16 01:37:26 UTC (rev 184423)
@@ -1,50 +0,0 @@
-<!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>
Modified: trunk/Source/WebCore/ChangeLog (184422 => 184423)
--- trunk/Source/WebCore/ChangeLog 2015-05-16 00:21:46 UTC (rev 184422)
+++ trunk/Source/WebCore/ChangeLog 2015-05-16 01:37:26 UTC (rev 184423)
@@ -1,3 +1,18 @@
+2015-05-15 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r184421.
+ https://bugs.webkit.org/show_bug.cgi?id=145087
+
+ Introduced 42 layout test failures (Requested by rniwa on
+ #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r183300): Background missing on top links on
+ apple.com"
+ https://bugs.webkit.org/show_bug.cgi?id=145079
+ http://trac.webkit.org/changeset/184421
+
2015-05-15 Simon Fraser <[email protected]>
REGRESSION (r183300): Background missing on top links on apple.com
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (184422 => 184423)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-16 00:21:46 UTC (rev 184422)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-16 01:37:26 UTC (rev 184423)
@@ -1260,17 +1260,10 @@
if (!visibleRectChanged && !coverageRectChanged)
return;
- // FIXME: we need to take reflections into account when determining whether this layer intersects the coverage rect.
- bool intersectsCoverageRect = !allowBackingStoreDetachment || m_coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
- if (intersectsCoverageRect != m_intersectsCoverageRect) {
- m_uncommittedChanges |= CoverageRectChanged;
- m_intersectsCoverageRect = intersectsCoverageRect;
- }
-
if (visibleRectChanged) {
m_uncommittedChanges |= CoverageRectChanged;
m_visibleRect = rects.visibleRect;
-
+
if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
// FIXME: this assumes that the mask layer has the same geometry as this layer (which is currently always true).
maskLayer->m_uncommittedChanges |= CoverageRectChanged;
@@ -1282,6 +1275,9 @@
m_uncommittedChanges |= CoverageRectChanged;
m_coverageRect = rects.coverageRect;
+ // 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()));
+
if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
maskLayer->m_uncommittedChanges |= CoverageRectChanged;
maskLayer->m_coverageRect = rects.coverageRect;
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (184422 => 184423)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-05-16 00:21:46 UTC (rev 184422)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-05-16 01:37:26 UTC (rev 184423)
@@ -2393,11 +2393,8 @@
return static_cast<GraphicsLayerClient&>(compositor()).isTrackingRepaints();
}
-bool RenderLayerBacking::shouldSkipLayerInDump(const GraphicsLayer* layer, LayerTreeAsTextBehavior behavior) const
+bool RenderLayerBacking::shouldSkipLayerInDump(const GraphicsLayer* layer, LayerTreeAsTextBehavior) const
{
- if (behavior & LayerTreeAsTextDebug)
- return false;
-
// Skip the root tile cache's flattening layer.
return m_isMainFrameRenderViewLayer && layer && layer == m_childContainmentLayer.get();
}
