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

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

Issue 2743523002: Move FrameHost::m_globalRootScrollerController to Page (Closed)
Patch Set: Rebase 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
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.h ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 43b273848448c0220f75951c1dedf45d6467e650..f998cf116a6901cc8e2b3f8b36400de3f638d7ad 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -34,7 +34,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"
@@ -50,8 +49,6 @@ FrameHost::FrameHost(Page& page)
OverscrollController::create(m_page->visualViewport(),
m_page->chromeClient())),
m_consoleMessageStorage(new ConsoleMessageStorage()),
- m_globalRootScrollerController(
- TopDocumentRootScrollerController::create(page)),
m_subframeCount(0) {}
// Explicitly in the .cpp to avoid default constructor in .h
@@ -91,14 +88,13 @@ const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
const {
- return *m_globalRootScrollerController;
+ return page().globalRootScrollerController();
}
DEFINE_TRACE(FrameHost) {
visitor->trace(m_page);
visitor->trace(m_overscrollController);
visitor->trace(m_consoleMessageStorage);
- visitor->trace(m_globalRootScrollerController);
}
#if DCHECK_IS_ON()
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.h ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698