am 7745e035: Merge change I94c715d6 into eclair

Merge commit '7745e035c94409815850be4be93a300301da576e' into eclair-plus-aosp

* commit '7745e035c94409815850be4be93a300301da576e':
  Skip requestRectangleOnScreen for WebTextView during

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;
+    }
 }

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