Index: Source/web/WebViewImpl.cpp |
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
index 9c7f9baa726108aa84e977ab7fd54c5e872ebff1..4f64d4a50e1e3609320e967c63bb6e9065c6ccec 100644 |
--- a/Source/web/WebViewImpl.cpp |
+++ b/Source/web/WebViewImpl.cpp |
@@ -2993,10 +2993,13 @@ void WebViewImpl::updatePageDefinedPageScaleConstraints(const ViewportArguments& |
if (!settings()->viewportEnabled() || !isFixedLayoutModeEnabled() || !page() || !m_size.width || !m_size.height) |
return; |
- m_pageScaleConstraintsSet.updatePageDefinedConstraints(arguments, m_size, page()->settings().layoutFallbackWidth()); |
+ ViewportArguments adjustedArguments = arguments; |
+ if (!settingsImpl()->expandLayoutToFillVisualViewport()) |
+ adjustedArguments.type = ViewportArguments::NoExpansionToFillVisualViewport; |
+ m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedArguments, m_size, page()->settings().layoutFallbackWidth()); |
kenneth.r.christiansen
2013/08/27 17:42:21
I would like us to be able to do this in the algor
mnaganov (inactive)
2013/08/27 18:16:51
Sorry, it's not clear to me what do you mean by "t
aelias_OOO_until_Jul13
2013/08/28 21:26:47
I think Kenneth is concerned that you're clobberin
mnaganov (inactive)
2013/08/29 12:09:54
Done.
|
if (settingsImpl()->supportDeprecatedTargetDensityDPI()) |
- m_pageScaleConstraintsSet.adjustPageDefinedConstraintsForAndroidWebView(arguments, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), page()->settings().useWideViewport(), page()->settings().loadWithOverviewMode()); |
+ m_pageScaleConstraintsSet.adjustPageDefinedConstraintsForAndroidWebView(adjustedArguments, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), page()->settings().useWideViewport(), page()->settings().loadWithOverviewMode()); |
WebSize layoutSize = flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize); |