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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 23691017: [Android WebView] Treat zero values in viewport arguments specially (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Separated two quirks and moved the zero values quirk into the parsing stage 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
« no previous file with comments | « Source/web/WebSettingsImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index bcfa7c3158c8ce8494405d14230a87912344b255..8e845e16bb71b6b95af37f0722a552d669eee8be 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -3017,6 +3017,10 @@ void WebViewImpl::updatePageDefinedPageScaleConstraints(const ViewportArguments&
ViewportArguments adjustedArguments = arguments;
if (settingsImpl()->viewportMetaLayoutSizeQuirk() && adjustedArguments.type == ViewportArguments::ViewportMeta)
adjustedArguments.type = ViewportArguments::ViewportMetaLayoutSizeQuirk;
+ if (page()->settings().viewportMetaZeroValuesQuirk() && adjustedArguments.type == ViewportArguments::ViewportMeta) {
rune 2013/09/02 20:09:06 Looking at the if-test two lines further up, this
mnaganov (inactive) 2013/09/03 09:07:27 I was proposing to merge those two quirks because
+ if (adjustedArguments.width == ViewportArguments::ValueDeviceWidth && !static_cast<int>(adjustedArguments.zoom))
+ adjustedArguments.zoom = 1.0;
rune 2013/09/02 20:09:06 If I understand this correctly, this could also ha
mnaganov (inactive) 2013/09/03 09:07:27 Thanks for the suggestion! Moved.
+ }
m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedArguments, m_size, page()->settings().layoutFallbackWidth());
if (settingsImpl()->supportDeprecatedTargetDensityDPI())
« no previous file with comments | « Source/web/WebSettingsImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698