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

Source/WebKit/chromium/src/WebSettingsImpl.h

Index: Source/WebKit/chromium/src/WebSettingsImpl.h
diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.h b/Source/WebKit/chromium/src/WebSettingsImpl.h
index 3111198c6b113bf2a4b418f9cead10f4ada30c80..44bc35ed62ee0682c7469924a70379f64b108eef 100644
--- a/Source/WebKit/chromium/src/WebSettingsImpl.h
+++ b/Source/WebKit/chromium/src/WebSettingsImpl.h
@@ -160,6 +160,7 @@ public:
     virtual void setUserStyleSheetLocation(const WebURL&);
     virtual void setUsesEncodingDetector(bool);
     virtual void setUsesPageCache(bool);
+    virtual void setUseWideViewport(bool);
     virtual void setValidationMessageTimerMagnification(int);
     virtual void setViewportEnabled(bool);
     virtual void setVisualWordMovementEnabled(bool);
@@ -177,6 +178,7 @@ public:
     bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }
     bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }
     bool supportDeprecatedTargetDensityDPI() const { return m_supportDeprecatedTargetDensityDPI; }
+    bool useWideViewport() const { return m_useWideViewport; }
 
 private:
     WebCore::Settings* m_settings;
@@ -185,6 +187,7 @@ private:
     bool m_renderVSyncNotificationEnabled;
     bool m_viewportEnabled;
     bool m_initializeAtMinimumPageScale;
+    bool m_useWideViewport;
     bool m_gestureTapHighlightEnabled;
     bool m_autoZoomFocusedNodeToLegibleScale;
     bool m_deferredImageDecodingEnabled;