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

Unified Diff: third_party/WebKit/Source/core/frame/FrameHost.cpp

Issue 2743523002: Move FrameHost::m_globalRootScrollerController to Page (Closed)
Patch Set: Created 3 years, 9 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/frame/FrameHost.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp b/third_party/WebKit/Source/core/frame/FrameHost.cpp
index d2c4765f8bd7dcac8f20e722cca9432ffc2f60ed..ec7e30fa8af9b2aee811c49a0c2e504c9bcc4b90 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -36,7 +36,6 @@
#include "core/inspector/ConsoleMessageStorage.h"
#include "core/page/Page.h"
#include "core/page/scrolling/OverscrollController.h"
-#include "core/page/scrolling/TopDocumentRootScrollerController.h"
#include "public/platform/Platform.h"
#include "public/platform/WebScheduler.h"
@@ -54,8 +53,6 @@ FrameHost::FrameHost(Page& page)
m_page->chromeClient())),
m_eventHandlerRegistry(new EventHandlerRegistry(page)),
m_consoleMessageStorage(new ConsoleMessageStorage()),
- m_globalRootScrollerController(
- TopDocumentRootScrollerController::create(page)),
m_subframeCount(0) {}
// Explicitly in the .cpp to avoid default constructor in .h
@@ -111,7 +108,7 @@ const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
const {
- return *m_globalRootScrollerController;
+ return page().globalRootScrollerController();
}
DEFINE_TRACE(FrameHost) {
@@ -120,7 +117,6 @@ DEFINE_TRACE(FrameHost) {
visitor->trace(m_overscrollController);
visitor->trace(m_eventHandlerRegistry);
visitor->trace(m_consoleMessageStorage);
- visitor->trace(m_globalRootScrollerController);
}
#if DCHECK_IS_ON()

Powered by Google App Engine
This is Rietveld 408576698