Changeset 83424 in webkit

Timestamp:

Apr 10, 2011 10:22:20 PM (13 years ago)

Author:

Simon Fraser

Message:

2011-04-10 Simon Fraser <Simon Fraser>

Reviewed by Maciej Stachowiak.

Car model dropdowns at audiusa.com lay out incorrectly with compositing enabled
​https://bugs.webkit.org/show_bug.cgi?id=56660

When overflow on an element changes, we need to inform compositing
layers which create and position an "ancestor clipping" layer based
on that overflow. Do this by triggering a rebuild of compositing layers
when overflow changes on a layer whose stacking context has compositing
descendants. (We can't just check whether the layer itself has compositing
descendants, because overflow follows the render tree, but compositing
follows the z-order tree.)

Test: compositing/geometry/ancestor-overflow-change.html

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::styleChanged):
• rendering/RenderLayer.h:
• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/geometry/ancestor-overflow-change-expected.checksum (added)
• LayoutTests/compositing/geometry/ancestor-overflow-change-expected.png (added)
• LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt (added)
• LayoutTests/compositing/geometry/ancestor-overflow-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayer.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Car model dropdowns at audiusa.com lay out incorrectly with compositing enabled
+        https://bugs.webkit.org/show_bug.cgi?id=56660
+        
+        Test that toggles overflow on an element with a composited descendent.
+
+        * compositing/geometry/ancestor-overflow-change-expected.checksum: Added.
+        * compositing/geometry/ancestor-overflow-change-expected.png: Added.
+        * compositing/geometry/ancestor-overflow-change-expected.txt: Added.
+        * compositing/geometry/ancestor-overflow-change.html: Added.
+
 2011-04-10  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Car model dropdowns at audiusa.com lay out incorrectly with compositing enabled
+        https://bugs.webkit.org/show_bug.cgi?id=56660
+        
+        When overflow on an element changes, we need to inform compositing
+        layers which create and position an "ancestor clipping" layer based
+        on that overflow. Do this by triggering a rebuild of compositing layers
+        when overflow changes on a layer whose stacking context has compositing
+        descendants. (We can't just check whether the layer itself has compositing
+        descendants, because overflow follows the render tree, but compositing
+        follows the z-order tree.)
+
+        Test: compositing/geometry/ancestor-overflow-change.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::styleChanged):
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
 2011-04-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3868 +3868 @@
 }
 
-void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle*)
+void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle)
 {
     bool isNormalFlowOnly = shouldBeNormalFlowOnly();
@@ -3913 +3913 @@
     else if (m_backing)
         m_backing->updateGraphicsLayerGeometry();
-
+    else if (oldStyle && oldStyle->overflowX() != renderer()->style()->overflowX()) {
+        if (stackingContext()->hasCompositingDescendant())
+            compositor()->setCompositingLayersNeedRebuild();
+    }
+    
     if (m_backing && diff >= StyleDifferenceRepaint)
         m_backing->setContentsNeedDisplay();

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -186 +186 @@
 #endif
 
-    void styleChanged(StyleDifference, const RenderStyle*);
+    void styleChanged(StyleDifference, const RenderStyle* oldStyle);
 
     RenderMarquee* marquee() const { return m_marquee; }
@@ -684 +684 @@
                                             // in a preserves3D hierarchy. Hint to do 3D-aware hit testing.
 #if USE(ACCELERATED_COMPOSITING)
-    bool m_hasCompositingDescendant : 1;
+    bool m_hasCompositingDescendant : 1; // In the z-order tree.
     bool m_mustOverlapCompositedLayers : 1;
 #endif

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -366 +366 @@
         // for a compositing layer, rootLayer is the layer itself.
         IntRect parentClipRect = m_owningLayer->backgroundClipRect(compAncestor, true);
+        ASSERT(parentClipRect != PaintInfo::infiniteRect());
         m_ancestorClippingLayer->setPosition(FloatPoint() + (parentClipRect.location() - graphicsLayerParentLocation));
         m_ancestorClippingLayer->setSize(parentClipRect.size());