Move TopDocumentRootScrollerController to a separate object on FrameHost

third_party/WebKit/Source/core/frame/FrameView.cpp

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 75066105a0d3259035c7c68a95c0dfe88e2c41a8..b2e0c4bbe84f7c8ecbfddda0e39c2a134b78e68c 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -82,8 +82,8 @@
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
-#include "core/page/scrolling/RootScrollerController.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
+#include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/FramePainter.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PrePaintTreeWalk.h"
@@ -2435,6 +2435,9 @@ void FrameView::didAttachDocument()
         RootFrameViewport* rootFrameViewport =
             RootFrameViewport::create(visualViewport, *layoutViewport);
         m_viewportScrollableArea = rootFrameViewport;
+
+        frameHost->globalRootScrollerController()
+            .initializeViewportScrollCallback(*rootFrameViewport);
     }
 }
 
@@ -2631,6 +2634,8 @@ void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState
 
             DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
+            m_frame->host()->globalRootScrollerController().didUpdateCompositing();
+
             if (targetState >= DocumentLifecycle::PrePaintClean) {
                 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
                     invalidateTreeIfNeededRecursive();