[Android WebView] Update viewport size and scale calculation to match WebView Classic

Source/WebKit/chromium/src/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 625 matching lines @@
         targetDPI = 120.0f;
     else if (arguments.deprecatedTargetDensityDPI == ViewportArguments::ValueMediumDPI)
         targetDPI = 160.0f;
     else if (arguments.deprecatedTargetDensityDPI == ViewportArguments::ValueHighDPI)
         targetDPI = 240.0f;
     else if (arguments.deprecatedTargetDensityDPI != ViewportArguments::ValueAuto)
         targetDPI = arguments.deprecatedTargetDensityDPI;
     return targetDPI > 0 ? (deviceScaleFactor * 120.0f) / targetDPI : 1.0f;
 }
 
+static float getLayoutWidthForNonWideViewport(const ViewportArguments& arguments, const FloatSize& deviceSize, float initialScale)
+{
+    return arguments.zoom == ViewportArguments::ValueAuto ? deviceSize.width() : deviceSize.width() / initialScale;
+}
+
 void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
 {
 #if ENABLE(VIEWPORT)
     if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
         return;
 
     IntSize viewportSize = m_webView->size();
     float deviceScaleFactor = m_webView->client()->screenInfo().deviceScaleFactor;
 
     // If the window size has not been set yet don't attempt to set the viewport.
     if (!viewportSize.width() || !viewportSize.height())
         return;
 
     ViewportAttributes computed = arguments.resolve(viewportSize, viewportSize, m_webView->page()->settings()->layoutFallbackWidth());
     restrictScaleFactorToInitialScaleIfNotUserScalable(computed);
 
     if (m_webView->ignoreViewportTagMaximumScale()) {
         computed.maximumScale = max(computed.maximumScale, m_webView->maxPageScaleFactor);
         computed.userScalable = true;
     }
-    if (arguments.zoom == ViewportArguments::ValueAuto && !m_webView->settingsImpl()->initializeAtMinimumPageScale())
-        computed.initialScale = 1.0f;
-
+    float initialScale = computed.initialScale;
+    if (arguments.zoom == ViewportArguments::ValueAuto && !m_webView->settingsImpl()->initializeAtMinimumPageScale()) {
+        if (arguments.width == ViewportArguments::ValueAuto
+            || (m_webView->settingsImpl()->useWideViewport()
+                && arguments.width != ViewportArguments::ValueAuto && arguments.width != ViewportArguments::ValueDeviceWidth))
+            computed.initialScale = 1.0f;
+    }
     if (m_webView->settingsImpl()->supportDeprecatedTargetDensityDPI()) {
         float targetDensityDPIFactor = calculateTargetDensityDPIFactor(arguments, deviceScaleFactor);
         computed.initialScale *= targetDensityDPIFactor;
         computed.minimumScale *= targetDensityDPIFactor;
         computed.maximumScale *= targetDensityDPIFactor;
-        computed.layoutSize.scale(1.0f / targetDensityDPIFactor);
+
+        if (m_webView->settingsImpl()->useWideViewport() && arguments.width == ViewportArguments::ValueAuto && arguments.zoom != 1.0f)
+            computed.layoutSize.setWidth(m_webView->page()->settings()->layoutFallbackWidth());
+        else {
+            if (!m_webView->settingsImpl()->useWideViewport())
+                computed.layoutSize.setWidth(getLayoutWidthForNonWideViewport(arguments, viewportSize, initialScale));
+            if (!m_webView->settingsImpl()->useWideViewport() || arguments.width == ViewportArguments::ValueAuto || arguments.width == ViewportArguments::ValueDeviceWidth)
+                computed.layoutSize.scale(1.0f / targetDensityDPIFactor);
+        }
     }
 
     m_webView->setInitialPageScaleFactor(computed.initialScale);
     m_webView->setFixedLayoutSize(flooredIntSize(computed.layoutSize));
     m_webView->setDeviceScaleFactor(deviceScaleFactor);
     m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
 #endif
 }
 
 void ChromeClientImpl::print(Frame* frame)
@@ skipping 499 matching lines @@
 {
 }
 
 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
 { 
     m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
 } 
 #endif
 
 } // namespace WebKit