Move TopDocumentRootScrollerController to a separate object on FrameHost

third_party/WebKit/Source/core/dom/Element.cpp

Index: third_party/WebKit/Source/core/dom/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index c957138044eff1b73aa2182707c2e3acd7a2a73d..c3a1e143cca4358eb8619f5b7f574d4ce9154ec1 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -129,6 +129,7 @@
 #include "core/page/scrolling/ScrollCustomizationCallbacks.h"
 #include "core/page/scrolling/ScrollState.h"
 #include "core/page/scrolling/ScrollStateCallback.h"
+#include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/PaintLayer.h"
 #include "core/svg/SVGAElement.h"
 #include "core/svg/SVGDocumentExtensions.h"
@@ -536,7 +537,7 @@ void Element::callDistributeScroll(ScrollState& scrollState)
     // allow the viewport scroll callback so we don't disable overscroll.
     // crbug.com/623079.
     bool disableCustomCallbacks = !scrollState.isDirectManipulation()
-        && !document().rootScrollerController()->isViewportScrollCallback(callback);
+        && !document().frameHost()->globalRootScrollerController().isViewportScrollCallback(callback);
 
     if (!callback || disableCustomCallbacks) {
         nativeDistributeScroll(scrollState);
@@ -614,7 +615,7 @@ void Element::callApplyScroll(ScrollState& scrollState)
     // allow the viewport scroll callback so we don't disable overscroll.
     // crbug.com/623079.
     bool disableCustomCallbacks = !scrollState.isDirectManipulation()
-        && !document().rootScrollerController()->isViewportScrollCallback(callback);
+        && !document().frameHost()->globalRootScrollerController().isViewportScrollCallback(callback);
 
     if (!callback || disableCustomCallbacks) {
         nativeApplyScroll(scrollState);