commit 0837fde9fd9e29f8ef66a3fe00764e15a6f3d515
author Shimeng (Simon) Wang <swang@google.com> Thu Mar 10 09:04:12 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 10 09:04:12 2011 -0800
tree f52e210253eed950da8f9542706c3b66a0824c61
parent 79b87df58861faeedd85804f6ea4f24eb67aef12
parent 3911b45005048e727cdc8f6ae58fd722e36f95fa

Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 1742a51..52f107f 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -535,7 +535,7 @@
             mTextWrapScale = scale;
         }
 
-        if (exceedsMinScaleIncrement(scale, mActualScale) || force) {
+        if (scale != mActualScale || force) {
             float oldScale = mActualScale;
             float oldInvScale = mInvActualScale;