Move last touch point when moving the cursor node.

Bug:3241968
Bug:3387455

The code was already in place, but needs to happen before we
return if mHeightCanMeasure == false.

Change-Id: Ic07dac4c4471bf4e2189f3fee322adeb23703f41

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index ca45e68..d759559 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -8073,7 +8073,7 @@ public class WebView extends AbsoluteLayout
                     + " mLastCursorTime=" + mLastCursorTime
                     + " handled=" + keyHandled);
         }
-        if (keyHandled == false || mHeightCanMeasure == false) {
+        if (keyHandled == false) {
             return keyHandled;
         }
         Rect contentCursorRingBounds = nativeGetCursorRingBounds();
@@ -8082,6 +8082,9 @@ public class WebView extends AbsoluteLayout
         // set last touch so that context menu related functions will work
         mLastTouchX = (viewCursorRingBounds.left + viewCursorRingBounds.right) / 2;
         mLastTouchY = (viewCursorRingBounds.top + viewCursorRingBounds.bottom) / 2;
+        if (mHeightCanMeasure == false) {
+            return keyHandled;
+        }
         Rect visRect = new Rect();
         calcOurVisibleRect(visRect);
         Rect outset = new Rect(visRect);