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

Source/WebKit/chromium/src/WebViewImpl.cpp

Index: Source/WebKit/chromium/src/WebViewImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 2cf3b71c7dec64eaa79d0c10aefddc15c2c9e6b6..aa4379943aeb5bc8dca34e4fa4e20f3b3bf38133 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -3047,6 +3047,10 @@ void WebViewImpl::computePageScaleFactorLimits()
             viewWidthNotIncludingScrollbars -= view->verticalScrollbar()->width();
         m_minimumPageScaleFactor = max(m_minimumPageScaleFactor, static_cast<float>(viewWidthNotIncludingScrollbars) / contentsSize().width());
         m_maximumPageScaleFactor = max(m_minimumPageScaleFactor, m_maximumPageScaleFactor);
+        if (m_initialPageScaleFactorOverride != -1) {
+            m_minimumPageScaleFactor = min(m_minimumPageScaleFactor, m_initialPageScaleFactorOverride);
+            m_maximumPageScaleFactor = max(m_maximumPageScaleFactor, m_initialPageScaleFactorOverride);
+        }
     }
     ASSERT(m_minimumPageScaleFactor <= m_maximumPageScaleFactor);