Changeset 176292 in webkit

Timestamp:

Nov 18, 2014, 3:07:30 PM (12 years ago)

Author:

Simon Fraser

Message:

Merge r175679. rdar://problem/18978404

Location:

branches/safari-600.3-branch/Source/WebCore

Files:

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

branches/safari-600.3-branch/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  Simon Fraser  <simon.fraser@apple.com>
 

branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp

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