Changeset 175679 in webkit

Timestamp:

Nov 5, 2014 10:07:06 PM (9 years ago)

Author:

Simon Fraser

Message:

Fix crash introduced in r175656
​https://bugs.webkit.org/show_bug.cgi?id=138453

Reviewed by Dan Bernstein.

repaintContainer can be null sometimes.

Covered by existing tests.

• rendering/RenderLayerCompositor.cpp:

(WebCore::styleChangeRequiresLayerRebuild):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix crash introduced in r175656
+        https://bugs.webkit.org/show_bug.cgi?id=138453
+
+        Reviewed by Dan Bernstein.
+
+        repaintContainer can be null sometimes.
+        
+        Covered by existing tests.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::styleChangeRequiresLayerRebuild):
+
 2014-11-05  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -885 +885 @@
     if (!oldStyle.opacity() != !newStyle.opacity()) {
         RenderLayerModelObject* repaintContainer = layer.renderer().containerForRepaint();
-        if (RenderLayerBacking* ancestorBacking = repaintContainer->layer()->backing()) {
+        if (RenderLayerBacking* ancestorBacking = repaintContainer ? repaintContainer->layer()->backing() : nullptr) {
             if (newStyle.opacity() != ancestorBacking->graphicsLayer()->drawsContent())
                 return true;