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

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

Issue 2718313002: Removed FrameHost::pageScaleConstraintsSet() (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
Index: third_party/WebKit/Source/core/frame/VisualViewport.cpp
diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp
index 85b69c29eb800e5386e1ae642492a6548d0a1884..dd45e7253789cd7be7039bc2d7f02eb335ed2544 100644
--- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp
@@ -534,8 +534,11 @@ ScrollOffset VisualViewport::maximumScrollOffset() const {
FloatSize frameViewSize(contentsSize());
if (m_browserControlsAdjustment) {
- float minScale =
- frameHost().pageScaleConstraintsSet().finalConstraints().minimumScale;
+ float minScale = frameHost()
+ .page()
+ .pageScaleConstraintsSet()
+ .finalConstraints()
+ .minimumScale;
frameViewSize.expand(0, m_browserControlsAdjustment / minScale);
}
@@ -786,7 +789,7 @@ bool VisualViewport::shouldDisableDesktopWorkarounds() const {
// the initial viewport width.
// 2. The author has disabled viewport zoom.
const PageScaleConstraints& constraints =
- frameHost().pageScaleConstraintsSet().pageDefinedConstraints();
+ frameHost().page().pageScaleConstraintsSet().pageDefinedConstraints();
return mainFrame()->view()->layoutSize().width() == m_size.width() ||
(constraints.minimumScale == constraints.maximumScale &&

Powered by Google App Engine
This is Rietveld 408576698