| 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)
|
|
|