Changeset 184421 in webkit

Timestamp:

May 15, 2015, 4:29:29 PM (11 years ago)

Author:

Simon Fraser

Message:

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.

Source/WebCore:

GraphicsLayerCA::setVisibleAndCoverageRects() only set the m_intersectsCoverageRect
flag if the coverage rect changed, but it doesn't if you simply change the size of
the layer.

Instead, always re-evaluate the intersection, and set the CoverageRectChanged bit
if it changes.

Test: compositing/visible-rect/backing-change-height-from-zero.html

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::shouldSkipLayerInDump): Don't skip any layers in a
debug layer dump, to assist debugging.

LayoutTests:

Composited box that toggles to a non-zero height and dumps layers.

• compositing/visible-rect/backing-change-height-from-zero-expected.txt: Added.
• compositing/visible-rect/backing-change-height-from-zero.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/visible-rect/backing-change-height-from-zero-expected.txt (added)
• LayoutTests/compositing/visible-rect/backing-change-height-from-zero.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
+        Composited box that toggles to a non-zero height and dumps layers.
+
+        * compositing/visible-rect/backing-change-height-from-zero-expected.txt: Added.
+        * compositing/visible-rect/backing-change-height-from-zero.html: Added.
+
 2015-05-15  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
+        GraphicsLayerCA::setVisibleAndCoverageRects() only set the m_intersectsCoverageRect
+        flag if the coverage rect changed, but it doesn't if you simply change the size of
+        the layer.
+
+        Instead, always re-evaluate the intersection, and set the CoverageRectChanged bit
+        if it changes.
+
+        Test: compositing/visible-rect/backing-change-height-from-zero.html
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::shouldSkipLayerInDump): Don't skip any layers in a
+        debug layer dump, to assist debugging.
+
 2015-05-15  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1261 +1261 @@
         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).
@@ -1275 +1282 @@
         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)) {

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -2394 +2394 @@
 }
 
-bool RenderLayerBacking::shouldSkipLayerInDump(const GraphicsLayer* layer, LayerTreeAsTextBehavior) const
-{
+bool RenderLayerBacking::shouldSkipLayerInDump(const GraphicsLayer* layer, LayerTreeAsTextBehavior behavior) const
+{
+    if (behavior & LayerTreeAsTextDebug)
+        return false;
+
     // Skip the root tile cache's flattening layer.
     return m_isMainFrameRenderViewLayer && layer && layer == m_childContainmentLayer.get();