[Android WebView] Avoid expanding layout width to match the old WebView

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2975 matching lines @@
     // isn't set at the end of a layout.
     if (view->needsLayout())
         view->layout();
 }
 
 void WebViewImpl::updatePageDefinedPageScaleConstraints(const ViewportArguments& arguments)
 {
     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 algorithm instead of afterward, as
we are moving to use @viewport internally

[mnaganov (inactive), 2013/08/27 18:16:51]

Sorry, it's not clear to me what do you mean by "this", and what do you mean by
"the algorithm". Are you proposing to pass the flag to
ViewportArguments::resolve instead of suppressing the viewport expansion logic
by tweaking the VA type?

[aelias_OOO_until_Jul13, 2013/08/28 21:26:47]

I think Kenneth is concerned that you're clobbering the ViewportArguments type
if it's something other than meta viewport tag.  I propose changing your if
statement above to:

if (settingsImpl()->viewportMetaLayoutSizeQuirk && arguments.type ==
ViewportArguments::ViewportMeta)

[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);
 
     if (page()->settings().textAutosizingEnabled() && page()->mainFrame() && layoutSize.width != fixedLayoutSize().width)
         page()->mainFrame()->document()->textAutosizer()->recalculateMultipliers();
 
     setFixedLayoutSize(layoutSize);
 }
 
 IntSize WebViewImpl::contentsSize() const
@@ skipping 1101 matching lines @@
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
     return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
         || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
 }
 
 } // namespace WebKit