Title: [176292] branches/safari-600.3-branch/Source/WebCore
Revision
176292
Author
[email protected]
Date
2014-11-18 15:07:30 -0800 (Tue, 18 Nov 2014)

Log Message

Merge r175679. rdar://problem/18978404

Modified Paths

Diff

Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176291 => 176292)


--- branches/safari-600.3-branch/Source/WebCore/ChangeLog	2014-11-18 23:07:28 UTC (rev 176291)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog	2014-11-18 23:07:30 UTC (rev 176292)
@@ -1,5 +1,19 @@
 2014-11-05  Simon Fraser  <[email protected]>
 
+        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  <[email protected]>
+
         Avoid backing store for opacity:0 descendant layers
         https://bugs.webkit.org/show_bug.cgi?id=138448
 

Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp (176291 => 176292)


--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp	2014-11-18 23:07:28 UTC (rev 176291)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderLayer.cpp	2014-11-18 23:07:30 UTC (rev 176292)
@@ -6428,7 +6428,7 @@
 
     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;
         }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to