Deploy smart pointer in ScrollingTreeScrollingNodeDelegate

https://bugs.webkit.org/show_bug.cgi?id=283868

Reviewed by Chris Dumez.

Deploy smart pointer in ScrollingTreeScrollingNodeDelegate

* Source/WebCore/page/scrolling/ScrollingTreeScrollingNodeDelegate.cpp:
(WebCore::ScrollingTreeScrollingNodeDelegate::lastCommittedScrollPosition const):
(WebCore::ScrollingTreeScrollingNodeDelegate::totalContentsSize):
(WebCore::ScrollingTreeScrollingNodeDelegate::reachableContentsSize):
(WebCore::ScrollingTreeScrollingNodeDelegate::scrollOrigin const):
* Source/WebCore/page/scrolling/ScrollingTreeScrollingNodeDelegate.h:
(WebCore::ScrollingTreeScrollingNodeDelegate::currentScrollPosition const):
(WebCore::ScrollingTreeScrollingNodeDelegate::minimumScrollPosition const):
(WebCore::ScrollingTreeScrollingNodeDelegate::maximumScrollPosition const):
(WebCore::ScrollingTreeScrollingNodeDelegate::scrollableAreaSize const):
(WebCore::ScrollingTreeScrollingNodeDelegate::totalContentsSize const):
(WebCore::ScrollingTreeScrollingNodeDelegate::allowsHorizontalScrolling const):
(WebCore::ScrollingTreeScrollingNodeDelegate::allowsVerticalScrolling const):
(WebCore::ScrollingTreeScrollingNodeDelegate::horizontalScrollElasticity const):
(WebCore::ScrollingTreeScrollingNodeDelegate::verticalScrollElasticity const):
* Source/WebCore/SaferCPPExpectations/NoUncountedMemberCheckerExpectations:
* Source/WebCore/SaferCPPExpectations/UncountedCallArgsCheckerExpectations:

Canonical link: https://commits.webkit.org/292555@main

Author: AlexsanderDamaceno

Source/WebCore/SaferCPPExpectations/NoUncountedMemberCheckerExpectations

@@ -60,7 +60,6 @@ page/WheelEventTestMonitor.h
 page/scrolling/ScrollLatchingController.h
 page/scrolling/ScrollingCoordinator.h
 page/scrolling/ScrollingTreeGestureState.h
-page/scrolling/ScrollingTreeScrollingNodeDelegate.h
 page/scrolling/mac/ScrollerMac.h
 platform/PODInterval.h
 platform/encryptedmedia/CDMProxy.h

Source/WebCore/SaferCPPExpectations/UncountedCallArgsCheckerExpectations

@@ -966,7 +966,6 @@ page/scrolling/ScrollingThread.cpp
 page/scrolling/ScrollingTree.cpp
 page/scrolling/ScrollingTree.h
 page/scrolling/ScrollingTreeGestureState.cpp
-page/scrolling/ScrollingTreeScrollingNodeDelegate.h
 page/scrolling/ThreadedScrollingCoordinator.cpp
 page/scrolling/mac/ScrollerMac.mm
 page/scrolling/mac/ScrollingCoordinatorMac.mm

Source/WebCore/page/scrolling/ScrollingTreeScrollingNodeDelegate.cpp

@@ -50,22 +50,22 @@ RefPtr<ScrollingTree> ScrollingTreeScrollingNodeDelegate::scrollingTree() const
 
 FloatPoint ScrollingTreeScrollingNodeDelegate::lastCommittedScrollPosition() const
 {
-    return m_scrollingNode.lastCommittedScrollPosition();
+    return protectedScrollingNode()->lastCommittedScrollPosition();
 }
 
 FloatSize ScrollingTreeScrollingNodeDelegate::totalContentsSize()
 {
-    return m_scrollingNode.totalContentsSize();
+    return protectedScrollingNode()->totalContentsSize();
 }
 
 FloatSize ScrollingTreeScrollingNodeDelegate::reachableContentsSize()
 {
-    return m_scrollingNode.reachableContentsSize();
+    return protectedScrollingNode()->reachableContentsSize();
 }
 
 IntPoint ScrollingTreeScrollingNodeDelegate::scrollOrigin() const
 {
-    return m_scrollingNode.scrollOrigin();
+    return protectedScrollingNode()->scrollOrigin();
 }
 
 } // namespace WebCore

Source/WebCore/page/scrolling/ScrollingTreeScrollingNodeDelegate.h

@@ -39,9 +39,9 @@ class ScrollingTreeScrollingNodeDelegate {
     WEBCORE_EXPORT explicit ScrollingTreeScrollingNodeDelegate(ScrollingTreeScrollingNode&);
     WEBCORE_EXPORT virtual ~ScrollingTreeScrollingNodeDelegate();
 
-    ScrollingTreeScrollingNode& scrollingNode() { return m_scrollingNode; }
-    const ScrollingTreeScrollingNode& scrollingNode() const { return m_scrollingNode; }
-    Ref<ScrollingTreeScrollingNode> protectedScrollingNode() const { return m_scrollingNode; }
+    RefPtr<ScrollingTreeScrollingNode> protectedScrollingNode() const { return m_scrollingNode.get(); }
+    ScrollingTreeScrollingNode& scrollingNode() { return  *protectedScrollingNode().get(); }
+    const ScrollingTreeScrollingNode& scrollingNode() const { return  *protectedScrollingNode().get(); }
 
     virtual bool startAnimatedScrollToPosition(FloatPoint) = 0;
     virtual void stopAnimatedScroll() = 0;
@@ -72,21 +72,21 @@ class ScrollingTreeScrollingNodeDelegate {
     WEBCORE_EXPORT FloatSize reachableContentsSize();
     WEBCORE_EXPORT IntPoint scrollOrigin() const;
 
-    FloatPoint currentScrollPosition() const { return m_scrollingNode.currentScrollPosition(); }
-    FloatPoint minimumScrollPosition() const { return m_scrollingNode.minimumScrollPosition(); }
-    FloatPoint maximumScrollPosition() const { return m_scrollingNode.maximumScrollPosition(); }
+    FloatPoint currentScrollPosition() const { return protectedScrollingNode()->currentScrollPosition(); }
+    FloatPoint minimumScrollPosition() const { return protectedScrollingNode()->minimumScrollPosition(); }
+    FloatPoint maximumScrollPosition() const { return protectedScrollingNode()->maximumScrollPosition(); }
 
-    FloatSize scrollableAreaSize() const { return m_scrollingNode.scrollableAreaSize(); }
-    FloatSize totalContentsSize() const { return m_scrollingNode.totalContentsSize(); }
+    FloatSize scrollableAreaSize() const { return protectedScrollingNode()->scrollableAreaSize(); }
+    FloatSize totalContentsSize() const { return protectedScrollingNode()->totalContentsSize(); }
 
-    bool allowsHorizontalScrolling() const { return m_scrollingNode.allowsHorizontalScrolling(); }
-    bool allowsVerticalScrolling() const { return m_scrollingNode.allowsVerticalScrolling(); }
+    bool allowsHorizontalScrolling() const { return protectedScrollingNode()->allowsHorizontalScrolling(); }
+    bool allowsVerticalScrolling() const { return protectedScrollingNode()->allowsVerticalScrolling(); }
 
-    ScrollElasticity horizontalScrollElasticity() const { return m_scrollingNode.horizontalScrollElasticity(); }
-    ScrollElasticity verticalScrollElasticity() const { return m_scrollingNode.verticalScrollElasticity(); }
+    ScrollElasticity horizontalScrollElasticity() const { return protectedScrollingNode()->horizontalScrollElasticity(); }
+    ScrollElasticity verticalScrollElasticity() const { return protectedScrollingNode()->verticalScrollElasticity(); }
 
 private:
-    ScrollingTreeScrollingNode& m_scrollingNode; // FIXME : Should use a smart pointer.
+    ThreadSafeWeakPtr<ScrollingTreeScrollingNode> m_scrollingNode; // m_scrollingNode is expected never be null
 };
 
 } // namespace WebCore