Title: [116339] trunk/Source/WebCore
Revision
116339
Author
[email protected]
Date
2012-05-07 12:35:40 -0700 (Mon, 07 May 2012)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (116338 => 116339)


--- trunk/Source/WebCore/ChangeLog	2012-05-07 19:22:05 UTC (rev 116338)
+++ trunk/Source/WebCore/ChangeLog	2012-05-07 19:35:40 UTC (rev 116339)
@@ -1,3 +1,13 @@
+2012-05-07  Adrienne Walker  <[email protected]>
+
+        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  <[email protected]>
 
         IndexedDB: Replace numeric constants with strings

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (116338 => 116339)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2012-05-07 19:22:05 UTC (rev 116338)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2012-05-07 19:35:40 UTC (rev 116339)
@@ -1255,9 +1255,11 @@
 
 #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
     
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to