Changeset 170306 in webkit

Timestamp:

Jun 23, 2014, 12:00:32 PM (11 years ago)

Author:

Simon Fraser

Message:

Adding a mask on a simple color compositing layer removes the content
​https://bugs.webkit.org/show_bug.cgi?id=134127

Reviewed by Dean Jackson.

Source/WebCore:

In r169053 I moved some updateDrawsContent() into updateAfterDescendents(),
but this isn't called when a composited layer gains or loses a mask (which
doesn't cause a layout). This caused us to fail to allocate backing store
when gaining a mask, resulting in missing content.

Fix by calling updateAfterDescendents() from RenderLayer::styleChange()
when the layer config isn't changing.

Also remove a condition in isSimpleContainerCompositingLayer() that caused us
to fall off the simple layer path for masked layers, since this works just
fine.

Test: compositing/masks/solid-color-masked.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):

LayoutTests:

• compositing/masks/mask-layer-size-expected.txt:
• compositing/masks/solid-color-masked-expected.html: Added.
• compositing/masks/solid-color-masked.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/masks/mask-layer-size-expected.txt (modified) (1 diff)
• LayoutTests/compositing/masks/solid-color-masked-expected.html (added)
• LayoutTests/compositing/masks/solid-color-masked.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-06-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Adding a mask on a simple color compositing layer removes the content
+        https://bugs.webkit.org/show_bug.cgi?id=134127
+
+        Reviewed by Dean Jackson.
+
+        * compositing/masks/mask-layer-size-expected.txt:
+        * compositing/masks/solid-color-masked-expected.html: Added.
+        * compositing/masks/solid-color-masked.html: Added.
+
 2014-06-23  David Hyatt  <hyatt@apple.com>
 

trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt

@@ -11 +11 @@
           (bounds 400.00 200.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Adding a mask on a simple color compositing layer removes the content
+        https://bugs.webkit.org/show_bug.cgi?id=134127
+
+        Reviewed by Dean Jackson.
+        
+        In r169053 I moved some updateDrawsContent() into updateAfterDescendents(),
+        but this isn't called when a composited layer gains or loses a mask (which
+        doesn't cause a layout). This caused us to fail to allocate backing store
+        when gaining a mask, resulting in missing content.
+        
+        Fix by calling updateAfterDescendents() from RenderLayer::styleChange()
+        when the layer config isn't changing.
+        
+        Also remove a condition in isSimpleContainerCompositingLayer() that caused us
+        to fall off the simple layer path for masked layers, since this works just
+        fine.
+
+        Test: compositing/masks/solid-color-masked.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+
 2014-06-23  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6396 +6396 @@
         || needsCompositingLayersRebuiltForOverflow(oldStyle, &newStyle))
         compositor().setCompositingLayersNeedRebuild();
-    else if (isComposited())
+    else if (isComposited()) {
+        // FIXME: updating geometry here is potentially harmful, because layout is not up-to-date.
         backing()->updateGeometry();
+        backing()->updateAfterDescendents();
+    }
 
     if (oldStyle) {

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1704 +1704 @@
 bool RenderLayerBacking::isSimpleContainerCompositingLayer() const
 {
-    if (renderer().hasMask()) // masks require special treatment
-        return false;
-
     if (renderer().isReplaced() && (!isCompositedPlugin(&renderer()) || isRestartedPlugin(&renderer())))
         return false;