commit 352cf1a45e26803a466d096ca2d679ea5a3ac249
author Ben Murdoch <benm@google.com> Thu Apr 01 08:42:14 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 01 08:42:14 2010 -0700
tree 318f0498635a64c18bd4fac40a0ed7674a5f585c
parent 461cef5d209fd072c82f6a70eb106e4690b7ef97
parent 2bb2553a20f33a2587ea33619d6be92343101eba

Merge changes Ic9531e3c,I3f04433b into froyo

* changes:
  Cherry pick from master.
  Cherry pick from master.

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index e4ba2b0..9acfda5 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -6413,10 +6413,15 @@
                                     mLastDeferTouchY = y;
                                     startDrag();
                                 }
-                                doDrag((int) (mLastDeferTouchX - x),
-                                        (int) (mLastDeferTouchY - y));
-                                mLastDeferTouchX = x;
-                                mLastDeferTouchY = y;
+                                int deltaX = pinLocX((int) (mScrollX
+                                        + mLastDeferTouchX - x))
+                                        - mScrollX;
+                                int deltaY = pinLocY((int) (mScrollY
+                                        + mLastDeferTouchY - y))
+                                        - mScrollY;
+                                doDrag(deltaX, deltaY);
+                                if (deltaX != 0) mLastDeferTouchX = x;
+                                if (deltaY != 0) mLastDeferTouchY = y;
                                 break;
                             }
                             case MotionEvent.ACTION_UP: