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

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

Issue 2729603005: Move m_overscrollController to Page (Closed)
Patch Set: Fixed small compile error 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 079454a00b08168e75428d25bbced27b2056f94c..226ca9134f15aeed4ccd08009595bb12047f8e0a 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -44,9 +44,6 @@ FrameHost* FrameHost::create(Page& page) {
FrameHost::FrameHost(Page& page)
: m_page(&page),
- m_overscrollController(
- OverscrollController::create(m_page->visualViewport(),
- m_page->chromeClient())),
m_subframeCount(0) {}
// Explicitly in the .cpp to avoid default constructor in .h
@@ -69,11 +66,11 @@ const BrowserControls& FrameHost::browserControls() const {
}
OverscrollController& FrameHost::overscrollController() {
- return *m_overscrollController;
+ return page().overscrollController();
}
const OverscrollController& FrameHost::overscrollController() const {
- return *m_overscrollController;
+ return page().overscrollController();
}
ConsoleMessageStorage& FrameHost::consoleMessageStorage() {
@@ -86,7 +83,6 @@ const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
DEFINE_TRACE(FrameHost) {
visitor->trace(m_page);
- visitor->trace(m_overscrollController);
}
#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