commit fbb1bb8ab7c0eda2dc6b53f06c86353151948b4b
author Shimeng (Simon) Wang <swang@google.com> Mon Aug 16 10:30:28 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 16 10:30:28 2010 -0700
tree 4339b6e3e5902fa5ba88fb3838a90fff7aa1d6b8
parent fed762b944efb690b10ca2705f02343dda0aab03
parent 54038acc8c5b85618911b9ca07403da365adfc97

Merge "Update variable to reflect its true value."

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 8033c9c..a973d64 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -784,6 +784,8 @@
                 && Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1))) {
             mInitialZoomOverview = false;
             setZoomScale(zoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale));
+        } else {
+            mInZoomOverview = !exceedsMinScaleIncrement(mActualScale, zoomOverviewScale);
         }
     }