Merge "Don't update webkit at every stage of a zoom animation."

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 63038503b238..ee0d122ead95 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -704,9 +704,10 @@ class ZoomManager {
      *         false otherwise.
      */
     public boolean isPreventingWebkitUpdates() {
-        // currently only animating a multi-touch zoom prevents updates, but
-        // others can add their own conditions to this method if necessary.
-        return mPinchToZoomAnimating;
+        // currently only animating a multi-touch zoom and fixed length
+        // animations prevent updates, but others can add their own conditions
+        // to this method if necessary.
+        return isZoomAnimating();
     }
 
     public ScaleGestureDetector getMultiTouchGestureDetector() {