Changeset 84349 in webkit

Timestamp:

Apr 20, 2011, 12:39:36 AM (14 years ago)

Author:

mjs@apple.com

Message:

2011-04-19 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Antti Koivisto.

Reproducible crash two-finger zooming at multiple sites in WebCore::RenderLayer::isTransparent
​https://bugs.webkit.org/show_bug.cgi?id=58868

I could not figure out how to make a test.

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintLayer): Check for existence of a parent before calling a method on it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        Reproducible crash two-finger zooming at multiple sites in WebCore::RenderLayer::isTransparent
+        https://bugs.webkit.org/show_bug.cgi?id=58868
+
+        I could not figure out how to make a test.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintLayer): Check for existence of a
+        parent before calling a method on it.
+
 2011-04-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2515 +2515 @@
 
         // If we have a transparency layer enclosing us and we are the root of a transform, then we need to establish the transparency
-        // layer from the parent now.
-        if (paintFlags & PaintLayerHaveTransparency)
-            parent()->beginTransparencyLayers(p, rootLayer, paintBehavior);
-  
+        // layer from the parent now, assuming there is a parent
+        if (paintFlags & PaintLayerHaveTransparency) {
+            if (parent())
+                parent()->beginTransparencyLayers(p, rootLayer, paintBehavior);
+            else
+                beginTransparencyLayers(p, rootLayer, paintBehavior);
+        }
+
         // Make sure the parent's clip rects have been calculated.
         IntRect clipRect = paintDirtyRect;