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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2285253003: Move TopDocumentRootScrollerController to a separate object on FrameHost (Closed)
Patch Set: Rebase Created 4 years, 3 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/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 5b4dacfcff21629db0a501546f56b480da727161..01494043fe0582f313fc4011fc6e247651ac2534 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -87,7 +87,7 @@
#include "core/page/PointerLockController.h"
#include "core/page/ScopedPageLoadDeferrer.h"
#include "core/page/TouchDisambiguation.h"
-#include "core/page/scrolling/RootScrollerController.h"
+#include "core/page/scrolling/TopDocumentRootScrollerController.h"
#include "core/paint/PaintLayer.h"
#include "core/timing/DOMWindowPerformance.h"
#include "core/timing/Performance.h"
@@ -4223,7 +4223,7 @@ void WebViewImpl::registerViewportLayersWithCompositor()
// Get the outer viewport scroll layer.
GraphicsLayer* layoutViewportScrollLayer =
- document->rootScrollerController()->rootScrollerLayer();
+ page()->frameHost().globalRootScrollerController().rootScrollerLayer();
WebLayer* layoutViewportWebLayer = layoutViewportScrollLayer
? layoutViewportScrollLayer->platformLayer()
: nullptr;

Powered by Google App Engine
This is Rietveld 408576698