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

Unified Diff: Source/web/PageScaleConstraintsSet.cpp

Issue 344203003: Replace loadWithOverviewMode settings with calls to shrinksViewportContentToFit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | « Source/web/PageScaleConstraintsSet.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/PageScaleConstraintsSet.cpp
diff --git a/Source/web/PageScaleConstraintsSet.cpp b/Source/web/PageScaleConstraintsSet.cpp
index 7eab89600e988ab519dd974df56f9be1f80d6542..271d941360b18ef154023350084e44bae60a785f 100644
--- a/Source/web/PageScaleConstraintsSet.cpp
+++ b/Source/web/PageScaleConstraintsSet.cpp
@@ -161,13 +161,13 @@ IntSize PageScaleConstraintsSet::mainFrameSize(const IntSize& contentsSize) cons
return frameSize;
}
-void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled)
+void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool shrinksViewportContentToFit, bool nonUserScalableQuirkEnabled)
{
- if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && loadWithOverviewMode && !nonUserScalableQuirkEnabled)
+ if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && shrinksViewportContentToFit && !nonUserScalableQuirkEnabled)
return;
const float oldInitialScale = m_pageDefinedConstraints.initialScale;
- if (!loadWithOverviewMode) {
+ if (!shrinksViewportContentToFit) {
bool resetInitialScale = false;
if (description.zoom == -1) {
if (description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom)
« no previous file with comments | « Source/web/PageScaleConstraintsSet.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698