ScrollingStateScrollingNode destructor should be able to handle being…

… called before being attached to a tree. https://bugs.webkit.org/show_bug.cgi?id=264722 rdar://117803479 Reviewed by Alex Christensen. Adding null check to handle the case when destructor being called before being attached to a tree. * Source/WebCore/page/scrolling/ScrollingStateNode.h: (WebCore::ScrollingStateNode::isAttachedToScrollingStateTree const): * Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp: (WebCore::ScrollingStateScrollingNode::~ScrollingStateScrollingNode): Canonical link: https://commits.webkit.org/270696@main
WebKit · Nov 14, 2023 · 6944158 · 6944158
1 parent e469aed
commit 6944158
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.h b/Source/WebCore/page/scrolling/ScrollingStateNode.h
@@ -304,6 +304,7 @@ class ScrollingStateNode : public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPt
     const LayerRepresentation& layer() const { return m_layer; }
     WEBCORE_EXPORT void setLayer(const LayerRepresentation&);
 
+    bool isAttachedToScrollingStateTree() const { return !!m_scrollingStateTree; }
     ScrollingStateTree& scrollingStateTree() const
     {
         ASSERT(m_scrollingStateTree);

diff --git a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
@@ -137,7 +137,8 @@ ScrollingStateScrollingNode::ScrollingStateScrollingNode(const ScrollingStateScr
 
 ScrollingStateScrollingNode::~ScrollingStateScrollingNode()
 {
-    scrollingStateTree().scrollingNodeRemoved();
+    if (isAttachedToScrollingStateTree())
+        scrollingStateTree().scrollingNodeRemoved();
 }
 
 OptionSet<ScrollingStateNode::Property> ScrollingStateScrollingNode::applicableProperties() const