Changeset 132394 in webkit

Timestamp:

Oct 24, 2012 1:36:02 PM (11 years ago)

Author:

Simon Fraser

Message:

Fix CALayer hiearchy when combining tiling with preserve-3d
​https://bugs.webkit.org/show_bug.cgi?id=100205

Reviewed by Dean Jackson.

Source/WebCore:

When an element has "transform-style: preserve-3d", its GraphicsLayerCA has a
m_structuralLayer which is a CATransformLayer. The primary CALayer which contains rendered
content becomes a sublayer of the CATransformLayer. If the element has backface-visibility:hidden,
it is the primary layer that is set to be single-sided.

In r131940 we started to use TileCaches in place of CATiledLayer. TileCaches work via
"customSublayers" returned from the PlatformCALayer, where the custom sublayer is
the tile cache container layer. However, the custom sublayers were being added as
children of the structural (CATransformLayer) layer, not of the primary (CALayer) layer,
thus they were not affected by the doubleSided property.

This change cleans up the confusing code in GraphicsLayerCA::updateSublayerList()
by maintaining two vectors of PlatformCALayers, one for sublayers of the structural
layer, and one for sublayers of the primary layer. It adds custom sublayers to
the latter list, so now the tile cache container layer becomes a sublayer of
the primary layer, so is affected by that layer's doubleSided property.

Test: compositing/tiling/backface-preserve-3d-tiled.html

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::updateSublayerList):

LayoutTests:

Pixel test that tests backface-visibility on a tile cache layer. Mark the test as
failing on Chromium.

• compositing/tiling/backface-preserve-3d-tiled-expected.png: Added.
• compositing/tiling/backface-preserve-3d-tiled-expected.txt: Added.
• compositing/tiling/backface-preserve-3d-tiled.html: Added.
• platform/chromium/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.png (added)
• LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt (added)
• LayoutTests/compositing/tiling/backface-preserve-3d-tiled.html (added)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix CALayer hiearchy when combining tiling with preserve-3d
+        https://bugs.webkit.org/show_bug.cgi?id=100205
+
+        Reviewed by Dean Jackson.
+
+        Pixel test that tests backface-visibility on a tile cache layer. Mark the test as
+        failing on Chromium.
+
+        * compositing/tiling/backface-preserve-3d-tiled-expected.png: Added.
+        * compositing/tiling/backface-preserve-3d-tiled-expected.txt: Added.
+        * compositing/tiling/backface-preserve-3d-tiled.html: Added.
+        * platform/chromium/TestExpectations:
+
 2012-10-24  Rick Byers  <rbyers@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -2819 +2819 @@
 webkit.org/b/98315 css3/compositing/blend-mode-property.html [ Failure ]
 webkit.org/b/98315 css3/compositing/should-have-compositing-layer.html [ Failure ]
+webkit.org/b/100205 compositing/tiling/backface-preserve-3d-tiled.html [ Failure ]
 
 # two regions reftests failing on Chromium

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix CALayer hiearchy when combining tiling with preserve-3d
+        https://bugs.webkit.org/show_bug.cgi?id=100205
+
+        Reviewed by Dean Jackson.
+
+        When an element has "transform-style: preserve-3d", its GraphicsLayerCA has a
+        m_structuralLayer which is a CATransformLayer. The primary CALayer which contains rendered
+        content becomes a sublayer of the CATransformLayer. If the element has backface-visibility:hidden,
+        it is the primary layer that is set to be single-sided.
+        
+        In r131940 we started to use TileCaches in place of CATiledLayer. TileCaches work via
+        "customSublayers" returned from the PlatformCALayer, where the custom sublayer is 
+        the tile cache container layer. However, the custom sublayers were being added as
+        children of the structural (CATransformLayer) layer, not of the primary (CALayer) layer,
+        thus they were not affected by the doubleSided property.
+        
+        This change cleans up the confusing code in GraphicsLayerCA::updateSublayerList()
+        by maintaining two vectors of PlatformCALayers, one for sublayers of the structural
+        layer, and one for sublayers of the primary layer. It adds custom sublayers to
+        the latter list, so now the tile cache container layer becomes a sublayer of
+        the primary layer, so is affected by that layer's doubleSided property.
+
+        Test: compositing/tiling/backface-preserve-3d-tiled.html
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateSublayerList):
+
 2012-10-23  Zhenyao Mo  <zmo@google.com>
 

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

@@ -1185 +1185 @@
 void GraphicsLayerCA::updateSublayerList()
 {
-    PlatformCALayerList newSublayers;
+    const PlatformCALayerList* customSublayers = m_layer->customSublayers();
+
+    PlatformCALayerList structuralLayerChildren;
+    PlatformCALayerList primaryLayerChildren;
+
+    PlatformCALayerList& childListForSublayers = m_structuralLayer ? structuralLayerChildren : primaryLayerChildren;
+
+    if (customSublayers)
+        primaryLayerChildren.append(*customSublayers);
+
+    if (m_structuralLayer) {
+        if (m_replicaLayer)
+            structuralLayerChildren.append(static_cast<GraphicsLayerCA*>(m_replicaLayer)->primaryLayer());
+    
+        structuralLayerChildren.append(m_layer);
+    }
+
+    if (m_contentsLayer && m_contentsVisible) {
+        // FIXME: add the contents layer in the correct order with negative z-order children.
+        // This does not cause visible rendering issues because currently contents layers are only used
+        // for replaced elements that don't have children.
+        primaryLayerChildren.append(m_contentsLayer);
+    }
+    
     const Vector<GraphicsLayer*>& childLayers = children();
-
-    if (const PlatformCALayerList* customSublayers = m_layer->customSublayers())
-        newSublayers.appendRange(customSublayers->begin(), customSublayers->end());
-    
-    if (m_structuralLayer || m_contentsLayer || childLayers.size() > 0) {
-        if (m_structuralLayer) {
-            // Add the replica layer first.
-            if (m_replicaLayer)
-                newSublayers.append(static_cast<GraphicsLayerCA*>(m_replicaLayer)->primaryLayer());
-            // Add the primary layer. Even if we have negative z-order children, the primary layer always comes behind.
-            newSublayers.append(m_layer);
-        } else if (m_contentsLayer && m_contentsVisible) {
-            // FIXME: add the contents layer in the correct order with negative z-order children.
-            // This does not cause visible rendering issues because currently contents layers are only used
-            // for replaced elements that don't have children.
-            newSublayers.append(m_contentsLayer);
-        }
-        
-        size_t numChildren = childLayers.size();
-        for (size_t i = 0; i < numChildren; ++i) {
-            GraphicsLayerCA* curChild = static_cast<GraphicsLayerCA*>(childLayers[i]);
-            PlatformCALayer* childLayer = curChild->layerForSuperlayer();
-            newSublayers.append(childLayer);
-        }
-
-        for (size_t i = 0; i < newSublayers.size(); --i)
-            newSublayers[i]->removeFromSuperlayer();
-    }
-    
+    size_t numChildren = childLayers.size();
+    for (size_t i = 0; i < numChildren; ++i) {
+        GraphicsLayerCA* curChild = static_cast<GraphicsLayerCA*>(childLayers[i]);
+        PlatformCALayer* childLayer = curChild->layerForSuperlayer();
+        childListForSublayers.append(childLayer);
+    }
+
 #ifdef VISIBLE_TILE_WASH
     if (m_visibleTileWashLayer)
-        newSublayers.append(m_visibleTileWashLayer);
+        childListForSublayers.append(m_visibleTileWashLayer);
 #endif
 
-    if (m_structuralLayer) {
-        m_structuralLayer->setSublayers(newSublayers);
-
-        if (m_contentsLayer) {
-            // If we have a transform layer, then the contents layer is parented in the 
-            // primary layer (which is itself a child of the transform layer).
-            m_layer->removeAllSublayers();
-            if (m_contentsVisible)
-                m_layer->appendSublayer(m_contentsLayer.get());
-        }
-    } else
-        m_layer->setSublayers(newSublayers);
+    if (m_structuralLayer)
+        m_structuralLayer->setSublayers(structuralLayerChildren);
+    
+    m_layer->setSublayers(primaryLayerChildren);
 }