summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shimeng (Simon) Wang <swang@google.com> 2011-03-10 09:04:12 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-03-10 09:04:12 -0800
commit0837fde9fd9e29f8ef66a3fe00764e15a6f3d515 (patch)
treef52e210253eed950da8f9542706c3b66a0824c61
parent79b87df58861faeedd85804f6ea4f24eb67aef12 (diff)
parent3911b45005048e727cdc8f6ae58fd722e36f95fa (diff)
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
-rw-r--r--core/java/android/webkit/ZoomManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 1742a5105196..52f107f6974d 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -535,7 +535,7 @@ class ZoomManager {
mTextWrapScale = scale;
}
- if (exceedsMinScaleIncrement(scale, mActualScale) || force) {
+ if (scale != mActualScale || force) {
float oldScale = mActualScale;
float oldInvScale = mInvActualScale;