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

When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.

Fix http://b/issue?id=2370552
---
 core/java/android/webkit/WebView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 7d0c53b4e4d3d..53215602f8986 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5206,7 +5206,8 @@ public class WebView extends AbsoluteLayout
                         if (Math.abs((viewWidth * mInvActualScale)
                                 - mZoomOverviewWidth) > 1) {
                             setNewZoomScale((float) viewWidth
-                                    / mZoomOverviewWidth, true, false);
+                                    / mZoomOverviewWidth, Math.abs(mActualScale
+                                            - mTextWrapScale) < 0.01f, false);
                         }
                     }
                     break;