2 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index d24a5ab..65ce158 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -813,4 +813,14 @@ import java.util.ArrayList;
     /* package */ void updateCachedTextfield() {
         mWebView.updateCachedTextfield(getText().toString());
     }
+
+    @Override
+    public boolean requestRectangleOnScreen(Rect rectangle) {
+        // don't scroll while in zoom animation. When it is done, we will adjust
+        // the WebTextView if it is in editing mode.
+        if (!mWebView.inAnimateZoom()) {
+            return super.requestRectangleOnScreen(rectangle);
+        }
+        return false;
+    }
 }
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 603f67a..8858b81 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2814,6 +2814,10 @@ public class WebView extends AbsoluteLayout
         }
     }
 
+    boolean inAnimateZoom() {
+        return mZoomScale != 0;
+    }
+
     /**
      * Need to adjust the WebTextView after a change in zoom, since mActualScale
      * has changed.  This is especially important for password fields, which are