Changeset 147682 in webkit

Timestamp:

Apr 4, 2013, 4:57:33 PM (12 years ago)

Author:

Simon Fraser

Message:

Page content missing when flipping from an empty layer to a tiled layer
​https://bugs.webkit.org/show_bug.cgi?id=113977
<rdar://problem/13444219>

Source/WebCore:

Reviewed by Tim Horton.

Some articles on USA Today were missing content on load, when a large GraphicsLayer
which did not draw content needed to draw content (and become tiled in the process).

The bug was an ordering dependency in GraphicsLayerCA::commitLayerChangesBeforeSublayers().
swapFromOrToTiledLayer() sets some dirty flags, but for some properties which have
already been committed in the current flush cycle.

Fix by moving the swapFromOrToTiledLayer() to the top of the commit, which is
safe since it only consults GraphicsLayer properties, not CALayer properties.

Test: compositing/tiling/empty-to-tiled.html

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateGeometry):
(WebCore::GraphicsLayerCA::updateLayerDrawsContent):
(WebCore::GraphicsLayerCA::updateContentsScale):

• platform/graphics/ca/GraphicsLayerCA.h:

(GraphicsLayerCA):

LayoutTests:

Reviewed by Tim Horton.

Ref test that adds visible content to a larger layer.

• compositing/tiling/empty-to-tiled-expected.html: Added.
• compositing/tiling/empty-to-tiled.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/tiling/empty-to-tiled-expected.html (added)
• LayoutTests/compositing/tiling/empty-to-tiled.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (5 diffs)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Page content missing when flipping from an empty layer to a tiled layer
+        https://bugs.webkit.org/show_bug.cgi?id=113977
+        <rdar://problem/13444219>
+
+        Reviewed by Tim Horton.
+        
+        Ref test that adds visible content to a larger layer.
+
+        * compositing/tiling/empty-to-tiled-expected.html: Added.
+        * compositing/tiling/empty-to-tiled.html: Added.
+
 2013-04-04  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Page content missing when flipping from an empty layer to a tiled layer
+        https://bugs.webkit.org/show_bug.cgi?id=113977
+        <rdar://problem/13444219>
+
+        Reviewed by Tim Horton.
+        
+        Some articles on USA Today were missing content on load, when a large GraphicsLayer
+        which did not draw content needed to draw content (and become tiled in the process).
+        
+        The bug was an ordering dependency in GraphicsLayerCA::commitLayerChangesBeforeSublayers().
+        swapFromOrToTiledLayer() sets some dirty flags, but for some properties which have
+        already been committed in the current flush cycle.
+        
+        Fix by moving the swapFromOrToTiledLayer() to the top of the commit, which is
+        safe since it only consults GraphicsLayer properties, not CALayer properties.
+
+        Test: compositing/tiling/empty-to-tiled.html
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+        (WebCore::GraphicsLayerCA::updateGeometry):
+        (WebCore::GraphicsLayerCA::updateLayerDrawsContent):
+        (WebCore::GraphicsLayerCA::updateContentsScale):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        (GraphicsLayerCA):
+
 2013-04-04  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

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

@@ -1126 +1126 @@
         return;
 
+    bool needTiledLayer = requiresTiledLayer(pageScaleFactor);
+    if (needTiledLayer != m_usingTiledBacking)
+        swapFromOrToTiledLayer(needTiledLayer);
+
     // Need to handle Preserves3DChanged first, because it affects which layers subsequent properties are applied to
     if (m_uncommittedChanges & (Preserves3DChanged | ReplicatedLayerChanged))
@@ -1134 +1138 @@
 
     if (m_uncommittedChanges & DrawsContentChanged)
-        updateLayerDrawsContent(pageScaleFactor);
+        updateLayerDrawsContent();
 
     if (m_uncommittedChanges & NameChanged)
@@ -1297 +1301 @@
     FloatSize pixelAlignmentOffset;
     computePixelAlignment(pageScaleFactor, positionRelativeToBase, scaledPosition, scaledSize, scaledAnchorPoint, pixelAlignmentOffset);
-
-    bool needTiledLayer = requiresTiledLayer(pageScaleFactor);
-    if (needTiledLayer != m_usingTiledBacking)
-        swapFromOrToTiledLayer(needTiledLayer);
 
     FloatSize usedSize = m_usingTiledBacking ? constrainedSize() : scaledSize;
@@ -1568 +1568 @@
 }
 
-void GraphicsLayerCA::updateLayerDrawsContent(float pageScaleFactor)
-{
-    bool needTiledLayer = requiresTiledLayer(pageScaleFactor);
-    if (needTiledLayer != m_usingTiledBacking)
-        swapFromOrToTiledLayer(needTiledLayer);
-
+void GraphicsLayerCA::updateLayerDrawsContent()
+{
     if (m_drawsContent)
         m_layer->setNeedsDisplay();
@@ -2568 +2564 @@
 void GraphicsLayerCA::updateContentsScale(float pageScaleFactor)
 {
-    bool needTiledLayer = requiresTiledLayer(pageScaleFactor);
-    if (needTiledLayer != m_usingTiledBacking)
-        swapFromOrToTiledLayer(needTiledLayer);
-
     float contentsScale = clampedContentsScaleForScale(pageScaleFactor * deviceScaleFactor());
     

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

@@ -330 +330 @@
     void updateBackfaceVisibility();
     void updateStructuralLayer();
-    void updateLayerDrawsContent(float pixelAlignmentScale);
+    void updateLayerDrawsContent();
     void updateBackgroundColor();