From 77fdaaa3afec345c9d9b367edd92e69ae97860bf Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Mon, 20 Sep 2010 18:12:30 -0700
Subject: [PATCH] Use max of content width and initial preferred width as the
 viewport.

issue: 3003933
Change-Id: I4a901219674b575e8228d44381efbaa159912465
---
 core/java/android/webkit/WebViewCore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index acea1632f373f..af7d95e61ce95 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;