Changeset 85781 in webkit

Timestamp:

May 4, 2011 1:17:48 PM (13 years ago)

Author:

cmarrin@apple.com

Message:

2011-05-04 Chris Marrin <​cmarrin@apple.com>

Reviewed by Simon Fraser.

Crash in PlatformCALayer ::replaceSublayer when layer has not superlayer
​https://bugs.webkit.org/show_bug.cgi?id=60191

Skip replaceSublayer when there is no superlayer rather than asserting.
This is probably not a problem and happens when restructuring the layer
tree. Avoiding this crash will allow us to get more testing.

• platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-04  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Crash in PlatformCALayer ::replaceSublayer when layer has not superlayer
+        https://bugs.webkit.org/show_bug.cgi?id=60191
+
+        Skip replaceSublayer when there is no superlayer rather than asserting.
+        This is probably not a problem and happens when restructuring the layer
+        tree. Avoiding this crash will allow us to get more testing.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
+
 2011-05-04  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -2042 +2042 @@
     m_layer->adoptSublayers(oldLayer.get());
     
-    // If m_layer doesn't have a parent, it means it's the root layer and
-    // is likely hosted by something that is not expecting to be changed
+    // FIXME: Skip this step if we don't have a superlayer. This is problably a benign
+    // case that happens while restructuring the layer tree.
     ASSERT(oldLayer->superlayer());
-    oldLayer->superlayer()->replaceSublayer(oldLayer.get(), m_layer.get());
+    if (oldLayer->superlayer())
+        oldLayer->superlayer()->replaceSublayer(oldLayer.get(), m_layer.get());
 
     updateContentsTransform();