commit 25dad8eda13d70a2473cde735042d083a578fb48
author Derek Sollenberger <djsollen@google.com> Fri Mar 18 11:02:45 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 18 11:02:45 2011 -0700
tree 8c2420f086b11d1dcf8e9b3ce5ba2336d4fc621d
parent a5eaf2eae0d11c45d9167f7fcadaafdeefad645c
parent 5750bb7d8f59c0f8e18baaa60bcb492c867db590

am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1

* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
  Prevent intermediate scale updates from being sent to WebKit while zooming.

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 72052a6..f2a1ec3 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -504,7 +504,7 @@
     }
 
     public boolean isFixedLengthAnimationInProgress() {
-        return mZoomScale != 0;
+        return mZoomScale != 0 || mInHWAcceleratedZoom;
     }
 
     public void refreshZoomScale(boolean reflowText) {