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

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

Issue 2730573003: Moved FrameHost::m_visualViewport to Page (Closed)
Patch Set: Fixed some compile errors on mac and android 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 e7ffb9b2a3e5b2da1bf7b3f0dbb239e8290e99fe..43b273848448c0220f75951c1dedf45d6467e650 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -31,7 +31,6 @@
#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
-#include "core/frame/VisualViewport.h"
#include "core/inspector/ConsoleMessageStorage.h"
#include "core/page/Page.h"
#include "core/page/scrolling/OverscrollController.h"
@@ -47,9 +46,8 @@ FrameHost* FrameHost::create(Page& page) {
FrameHost::FrameHost(Page& page)
: m_page(&page),
- m_visualViewport(VisualViewport::create(page)),
m_overscrollController(
- OverscrollController::create(*m_visualViewport,
+ OverscrollController::create(m_page->visualViewport(),
m_page->chromeClient())),
m_consoleMessageStorage(new ConsoleMessageStorage()),
m_globalRootScrollerController(
@@ -83,14 +81,6 @@ const OverscrollController& FrameHost::overscrollController() const {
return *m_overscrollController;
}
-VisualViewport& FrameHost::visualViewport() {
- return *m_visualViewport;
-}
-
-const VisualViewport& FrameHost::visualViewport() const {
- return *m_visualViewport;
-}
-
ConsoleMessageStorage& FrameHost::consoleMessageStorage() {
return *m_consoleMessageStorage;
}
@@ -106,7 +96,6 @@ TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
DEFINE_TRACE(FrameHost) {
visitor->trace(m_page);
- visitor->trace(m_visualViewport);
visitor->trace(m_overscrollController);
visitor->trace(m_consoleMessageStorage);
visitor->trace(m_globalRootScrollerController);
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.h ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698