[Android WebView] Treat zero values in viewport arguments specially

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 2999 matching lines @@
 }
 
 void WebViewImpl::updatePageDefinedPageScaleConstraints(const ViewportArguments& arguments)
 {
     if (!settings()->viewportEnabled() || !isFixedLayoutModeEnabled() || !page() || !m_size.width || !m_size.height)
         return;
 
     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 if triggers if
viewportMetaLayoutSizeQuirk is off and viewportMetaZeroValuesQuirk is on. That
doesn't make sense if they could have been one quirk like in the previous patch
set?

[mnaganov (inactive), 2013/09/03 09:07:27]

I was proposing to merge those two quirks because I was only thinking in terms
of ViewportArguments::resolve implementation and didn't see other way around.
But as we have moved the processing of the "zero values" quirk into the parsing
stage, they actually can be independent. As I've understood from the discussions
with Adam Barth and Eric Seidel, they would prefer to deal with small
independent quirks than a big complex one.

+        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 have been done at parse-time
right after processArguments() in Document::processViewport().

[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())
         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();
 
@@ skipping 1097 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