[Android WebView] Add a legacy quirk for 'user-scalable=no' case

Source/web/PageScaleConstraintsSet.cpp

 /*
  * Copyright (C) 2013 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 116 matching lines @@
 static float getLayoutWidthForNonWideViewport(const FloatSize& deviceSize, float initialScale)
 {
     return initialScale == -1 ? deviceSize.width() : deviceSize.width() / initialScale;
 }
 
 static float computeHeightByAspectRatio(float width, const FloatSize& deviceSize)
 {
     return width * (deviceSize.height() / deviceSize.width());
 }
 
-void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, IntSize viewSize, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode)
+void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, IntSize viewSize, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled)
 {
-    if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && loadWithOverviewMode)
+    if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && loadWithOverviewMode && !nonUserScalableQuirkEnabled)
         return;
 
     const float oldInitialScale = m_pageDefinedConstraints.initialScale;
     if (!loadWithOverviewMode) {
         bool resetInitialScale = false;
         if (description.zoom == -1) {
             if (description.maxWidth.isAuto())
                 resetInitialScale = true;
             if (useWideViewport || description.maxWidth == Length(100, ViewportPercentageWidth))
                 resetInitialScale = true;
@@ skipping 27 matching lines @@
             adjustedLayoutSizeWidth = getLayoutWidthForNonWideViewport(viewSize, nonWideScale) / targetDensityDPIFactor;
             adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, viewSize);
             if (description.zoom < 1) {
                 m_pageDefinedConstraints.initialScale = targetDensityDPIFactor;
                 m_pageDefinedConstraints.minimumScale = std::min<float>(m_pageDefinedConstraints.minimumScale, m_pageDefinedConstraints.initialScale);
                 m_pageDefinedConstraints.maximumScale = std::max<float>(m_pageDefinedConstraints.maximumScale, m_pageDefinedConstraints.initialScale);
             }
         }
     }
 
+    if (nonUserScalableQuirkEnabled && !description.userZoom) {
+        m_pageDefinedConstraints.initialScale = targetDensityDPIFactor;
+        m_pageDefinedConstraints.minimumScale = m_pageDefinedConstraints.initialScale;

[aelias_OOO_until_Jul13, 2013/11/06 20:45:25]

Hmm, I don't think this should've been moved here in the last patchset.  Now if
the wideViewportQuirk block changed initial-scale, user-scalable=no doesn't work
properly again.  It's a pre-existing bug but it would've been nice to fix.

+        m_pageDefinedConstraints.maximumScale = m_pageDefinedConstraints.initialScale;
+        if (description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom || description.maxWidth == Length(100, ViewportPercentageWidth)) {
+            adjustedLayoutSizeWidth = viewSize.width() / targetDensityDPIFactor;
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, viewSize);
+        }
+    }
+
     m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth);
     m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight);
 }
 
 } // namespace WebCore