Changeset 268836 in webkit

Timestamp:

Oct 21, 2020, 3:16:03 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r268712. rdar://problem/70541891

Fix crash in RenderLayerBacking::updateClippingStackLayerGeometry()
​https://bugs.webkit.org/show_bug.cgi?id=217940
<rdar://problem/70316952>

Reviewed by Tim Horton.

Crash data suggest that entry.clipData.clippingLayer (which is a WeakRef<RenderLayer>)
can be null, so check it.

• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::updateClippingStackLayerGeometry):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@268712 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Source/WebCore

Files:

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

branches/safari-610-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r268712. rdar://problem/70541891
+
+    Fix crash in RenderLayerBacking::updateClippingStackLayerGeometry()
+    https://bugs.webkit.org/show_bug.cgi?id=217940
+    <rdar://problem/70316952>
+    
+    Reviewed by Tim Horton.
+    
+    Crash data suggest that entry.clipData.clippingLayer (which is a WeakRef<RenderLayer>)
+    can be null, so check it.
+    
+    * rendering/RenderLayerBacking.cpp:
+    (WebCore::RenderLayerBacking::updateClippingStackLayerGeometry):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-19  Simon Fraser  <simon.fraser@apple.com>
+
+            Fix crash in RenderLayerBacking::updateClippingStackLayerGeometry()
+            https://bugs.webkit.org/show_bug.cgi?id=217940
+            <rdar://problem/70316952>
+
+            Reviewed by Tim Horton.
+
+            Crash data suggest that entry.clipData.clippingLayer (which is a WeakRef<RenderLayer>)
+            can be null, so check it.
+
+            * rendering/RenderLayerBacking.cpp:
+            (WebCore::RenderLayerBacking::updateClippingStackLayerGeometry):
+
 2020-10-21  Russell Epstein  <repstein@apple.com>
 

branches/safari-610-branch/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1914 +1914 @@
 
         if (entry.clipData.isOverflowScroll) {
-            ScrollOffset scrollOffset = entry.clipData.clippingLayer->scrollOffset();
+            ScrollOffset scrollOffset = entry.clipData.clippingLayer ? entry.clipData.clippingLayer->scrollOffset() : ScrollOffset();
 
             entry.clippingLayer->setBoundsOrigin(scrollOffset);