From 76336f2ccfcb97a6ad75f88abe95f57c3dd5b59d Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Thu, 14 Jan 2010 18:18:41 -0800
Subject: [PATCH] DO NOT MERGE

If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.

Fix http://b/issue?id=2375232
---
 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 c3817fbd4b139..8ac915c556e34 100644
--- 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),