Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 2113483002: Make RootScroller set the outer viewport scroll layer in the compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 810755bd6138d2740859c6dfeebac5ffb123a164..f654ee3a79260ee4fd4d6cf94624047f2082e8b2 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());

Powered by Google App Engine
This is Rietveld 408576698