Changeset 116339 in webkit

Timestamp:

May 7, 2012 12:35:40 PM (12 years ago)

Author:

enne@google.com

Message:

Fix containerForRepaint() assumption about non-null enclosingLayer()
​https://bugs.webkit.org/show_bug.cgi?id=85807

Reviewed by Simon Fraser.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::containerForRepaint):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-07  Adrienne Walker  <enne@google.com>
+
+        Fix containerForRepaint() assumption about non-null enclosingLayer()
+        https://bugs.webkit.org/show_bug.cgi?id=85807
+
+        Reviewed by Simon Fraser.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::containerForRepaint):
+
 2012-05-07  Alec Flett  <alecflett@chromium.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1256 +1256 @@
 #if USE(ACCELERATED_COMPOSITING)
     if (v->usesCompositing()) {
-        RenderLayer* compLayer = enclosingLayer()->enclosingCompositingLayerForRepaint();
-        if (compLayer)
-            repaintContainer = compLayer->renderer();
+        if (RenderLayer* parentLayer = enclosingLayer()) {
+            RenderLayer* compLayer = parentLayer->enclosingCompositingLayerForRepaint();
+            if (compLayer)
+                repaintContainer = compLayer->renderer();
+        }
     }
 #endif