Source/core/page/PageScaleConstraintsSet.cpp - Issue 23459006: [Android WebView] Fix WideViewport use case after r157293

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/page/PageScaleConstraintsSet.cpp

Issue 23459006: [Android WebView] Fix WideViewport use case after r157293 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Added a test for useWideViewport=false + <meta name='viewport' content='height=1000'> Created 7 years, 3 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: Source/core/page/PageScaleConstraintsSet.cpp

diff --git a/Source/core/page/PageScaleConstraintsSet.cpp b/Source/core/page/PageScaleConstraintsSet.cpp

index ec1a4ec9c2e4749954706e0f3ac2c4ebaa6144d1..02fdf302c0cc0f7f761379d129e44bc019e77fbd 100644

--- a/Source/core/page/PageScaleConstraintsSet.cpp

+++ b/Source/core/page/PageScaleConstraintsSet.cpp

@@ -136,12 +136,12 @@ void PageScaleConstraintsSet::adjustPageDefinedConstraintsForAndroidWebView(cons

m_pageDefinedConstraints.maximumScale *= targetDensityDPIFactor;

float adjustedLayoutSizeWidth = m_pageDefinedConstraints.layoutSize.width();

- if (useWideViewport && arguments.maxWidth.type() == ExtendToZoom && arguments.zoom != 1.0f)

+ if (useWideViewport && (arguments.maxWidth.isAuto() || arguments.maxWidth.type() == ExtendToZoom) && arguments.zoom != 1.0f)

adjustedLayoutSizeWidth = layoutFallbackWidth;

else {

if (!useWideViewport)

adjustedLayoutSizeWidth = getLayoutWidthForNonWideViewport(viewSize, initialScale);

- if (!useWideViewport || arguments.maxWidth.type() == ExtendToZoom || arguments.maxWidth.isViewportPercentage())

+ if (!useWideViewport || (arguments.maxWidth.isAuto() || arguments.maxWidth.type() == ExtendToZoom) || arguments.maxWidth.isViewportPercentage())

adjustedLayoutSizeWidth /= targetDensityDPIFactor;

}

« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »