Merge "Use max of content width and initial preferred width as the viewport."

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index acea1632f373..af7d95e61ce9 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1831,7 +1831,7 @@ final class WebViewCore {
                     mSettings.getUseWideViewPort()) {
                     // Use website's initial preferred width as the fixed viewport width.
                     mViewportWidth = Math.min(mSettings.getMaxFixedViewportWidth(),
-                        draw.mMinPrefWidth);
+                        Math.max(draw.mWidthHeight.x, draw.mMinPrefWidth));
                     draw.mViewState.mViewportWidth = mViewportWidth;
                 }
                 mInitialViewState = null;