Changeset 243120 in webkit

Timestamp:

Mar 18, 2019 5:33:16 PM (5 years ago)

Author:

Simon Fraser

Message:

Crash when reloading test with async overflow scrolling
​https://bugs.webkit.org/show_bug.cgi?id=195629
<rdar://problem/48814045>

Reviewed by Antoine Quint.

RenderLayerCompositor::removeFromScrollCoordinatedLayers needs to pass the Positioning
bit to make sure we remove RenderLayers added m_scrollingNodeToLayerMap for Positioning
scrolling nodes.

Fixes crashes seen in compositing/clipping/border-radius-async-overflow-non-stacking.html
and scrollingcoordinator/scrolling-tree/remove-coordinated-frame.html.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::~RenderLayerBacking):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::removeFromScrollCoordinatedLayers):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-18  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash when reloading test with async overflow scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=195629
+        <rdar://problem/48814045>
+
+        Reviewed by Antoine Quint.
+
+        RenderLayerCompositor::removeFromScrollCoordinatedLayers needs to pass the Positioning
+        bit to make sure we remove RenderLayers added m_scrollingNodeToLayerMap for Positioning
+        scrolling nodes.
+
+        Fixes crashes seen in compositing/clipping/border-radius-async-overflow-non-stacking.html
+        and scrollingcoordinator/scrolling-tree/remove-coordinated-frame.html.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::~RenderLayerBacking):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::removeFromScrollCoordinatedLayers):
+
 2019-03-18  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -251 +251 @@
     ASSERT(!m_scrollingNodeID);
     ASSERT(!m_frameHostingNodeID);
+    ASSERT(!m_positioningNodeID);
 
     destroyGraphicsLayers();

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3806 +3806 @@
 #endif
 
-    detachScrollCoordinatedLayer(layer, { ScrollCoordinationRole::Scrolling, ScrollCoordinationRole::ViewportConstrained, ScrollCoordinationRole::FrameHosting });
+    detachScrollCoordinatedLayer(layer, { ScrollCoordinationRole::Scrolling, ScrollCoordinationRole::ViewportConstrained, ScrollCoordinationRole::FrameHosting, ScrollCoordinationRole::Positioning });
 }