| 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 c629e44e6990fabdeb60bb1f746c2c3e3b8dcffc..50cf15c89399274044b54eef674317b2c3179a6a 100644
|
| --- a/third_party/WebKit/Source/core/dom/Element.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Element.cpp
|
| @@ -121,6 +121,7 @@
|
| #include "core/page/Page.h"
|
| #include "core/page/PointerLockController.h"
|
| #include "core/page/SpatialNavigation.h"
|
| +#include "core/page/scrolling/RootScrollerController.h"
|
| #include "core/page/scrolling/ScrollCustomizationCallbacks.h"
|
| #include "core/page/scrolling/ScrollState.h"
|
| #include "core/page/scrolling/ScrollStateCallback.h"
|
| @@ -565,7 +566,7 @@ void Element::nativeApplyScroll(ScrollState& scrollState)
|
|
|
| // We should only ever scroll the effective root scroller this way when the
|
| // page removes the default applyScroll (ViewportScrollCallback).
|
| - if (document().effectiveRootScroller() == this)
|
| + if (document().rootScrollerController()->effectiveRootScroller() == this)
|
| boxToScroll = document().layoutView();
|
| else if (layoutObject())
|
| boxToScroll = toLayoutBox(layoutObject());
|
|
|