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 c9610670acf3a4a4b8a2f6456b9c27bb36e8a8d1..8aacee8f739f87b27d2d7f3f14c317a979854d39 100644 |
--- a/third_party/WebKit/Source/core/dom/Element.cpp |
+++ b/third_party/WebKit/Source/core/dom/Element.cpp |
@@ -127,6 +127,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" |
@@ -534,7 +535,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); |
@@ -612,7 +613,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); |