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

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

Issue 2723493004: Move FrameHost::m_pageScaleConstraintsSet to Page (Closed)
Patch Set: Rebase Created 3 years, 10 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 de575c82bd519589a1cbf1a0414ab61645ee6619..a1047400c6b6df086413bcf5c756ad0db4d29204 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -52,7 +52,6 @@ FrameHost* FrameHost::create(Page& page) {
FrameHost::FrameHost(Page& page)
: m_page(&page),
m_browserControls(BrowserControls::create(*this)),
- m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
m_visualViewport(VisualViewport::create(*this)),
m_overscrollController(
OverscrollController::create(*m_visualViewport,
@@ -99,11 +98,11 @@ const VisualViewport& FrameHost::visualViewport() const {
}
PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() {
- return *m_pageScaleConstraintsSet;
+ return page().pageScaleConstraintsSet();
}
const PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const {
- return *m_pageScaleConstraintsSet;
+ return page().pageScaleConstraintsSet();
}
EventHandlerRegistry& FrameHost::eventHandlerRegistry() {
« 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