commit b869c594465d29e96fb841b48c638ddee232bbd7
author Grace Kloba <klobag@google.com> Mon Jan 18 23:43:32 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 18 23:43:32 2010 -0800
tree 36279eba1bcbaa4e5650ff4b3a0e06389fd96159
parent 55d791e74eaa8c80b965075d6debc1cfd7bde99a
parent 17b14bd36aba265ac6bffc2626d8db29713d7c45

am 17b14bd3: DO NOT MERGE

Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp

* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
  DO NOT MERGE

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index c749df3..023f61f 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5194,8 +5194,9 @@
                         mPictureListener.onNewPicture(WebView.this, capturePicture());
                     }
                     if (useWideViewport) {
-                        mZoomOverviewWidth = Math.max(draw.mMinPrefWidth,
-                                draw.mViewPoint.x);
+                        mZoomOverviewWidth = Math.max(
+                                (int) (viewWidth / mDefaultScale), Math.max(
+                                        draw.mMinPrefWidth, draw.mViewPoint.x));
                     }
                     if (!mMinZoomScaleFixed) {
                         mMinZoomScale = (float) viewWidth / mZoomOverviewWidth;