Merge "DO NOT MERGE" into eclair

2010-01-14 19:28:55 -08:00
parent 79f05bb4a5 76336f2ccf
commit d1019a99f9
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1518,7 +1518,7 @@ final class WebViewCore {
            } else if (mViewportWidth > 0) {
                width = Math.max(w, mViewportWidth);
            } else {
-                width = Math.max(w, textwrapWidth);
+                width = textwrapWidth;
            }
        }
        nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),