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

Unified Diff: third_party/WebKit/Source/core/page/Page.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/page/Page.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/page/Page.cpp
diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp
index 8f4ead3896155865769235846ca948323af81897..1f6910aa91d0e0d0b915c6952fae75daacec222e 100644
--- a/third_party/WebKit/Source/core/page/Page.cpp
+++ b/third_party/WebKit/Source/core/page/Page.cpp
@@ -34,6 +34,7 @@
#include "core/frame/FrameConsole.h"
#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
+#include "core/frame/PageScaleConstraintsSet.h"
#include "core/frame/RemoteFrame.h"
#include "core/frame/RemoteFrameView.h"
#include "core/frame/Settings.h"
@@ -99,6 +100,7 @@ Page::Page(PageClients& pageClients)
m_focusController(FocusController::create(this)),
m_contextMenuController(
ContextMenuController::create(this, pageClients.contextMenuClient)),
+ m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
m_pointerLockController(PointerLockController::create(this)),
m_mainFrame(nullptr),
m_editorClient(pageClients.editorClient),
@@ -150,6 +152,14 @@ ScrollingCoordinator* Page::scrollingCoordinator() {
return m_scrollingCoordinator.get();
}
+PageScaleConstraintsSet& Page::pageScaleConstraintsSet() {
+ return *m_pageScaleConstraintsSet;
+}
+
+const PageScaleConstraintsSet& Page::pageScaleConstraintsSet() const {
+ return *m_pageScaleConstraintsSet;
+}
+
ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
DisableCompositingQueryAsserts disabler;
if (ScrollingCoordinator* scrollingCoordinator =
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698