Support skipping a touch stream due to lack of handlers

 Bug: 6317798

Change-Id: Ia1652e9030e877e270326e9e8a8b040810b89f09

1 files changed, 10 insertions, 2 deletions

diff --git a/core/java/android/webkit/WebViewInputDispatcher.java b/core/java/android/webkit/WebViewInputDispatcher.java
index feff16ec0443..d8065e951681 100644
--- a/core/java/android/webkit/WebViewInputDispatcher.java
+++ b/core/java/android/webkit/WebViewInputDispatcher.java
@@ -686,7 +686,7 @@ final class WebViewInputDispatcher {
                     + ", eventType=" + eventType + ", flags=" + flags);
         }
         boolean preventDefault = mWebKitCallbacks.dispatchWebKitEvent(
-                event, eventType, flags);
+                this, event, eventType, flags);
         if (DEBUG) {
             Log.d(TAG, "dispatchWebKitEvent: preventDefault=" + preventDefault);
         }
@@ -710,6 +710,12 @@ final class WebViewInputDispatcher {
         mWebKitDispatchEventQueue.mHead = d;
     }
 
+    // Called by WebKit when it doesn't care about the rest of the touch stream
+    public void skipWebkitForRemainingTouchStream() {
+        // Just treat this like a timeout
+        handleWebKitTimeout();
+    }
+
     // Runs on UI thread in response to the web kit thread appearing to be unresponsive.
     private void handleWebKitTimeout() {
         synchronized (mLock) {
@@ -1081,12 +1087,14 @@ final class WebViewInputDispatcher {
 
         /**
          * Dispatches an event to web kit.
+         * @param dispatcher The WebViewInputDispatcher sending the event
          * @param event The event.
          * @param eventType The event type.
          * @param flags The event's dispatch flags.
          * @return True if web kit wants to prevent default event handling.
          */
-        public boolean dispatchWebKitEvent(MotionEvent event, int eventType, int flags);
+        public boolean dispatchWebKitEvent(WebViewInputDispatcher dispatcher,
+                MotionEvent event, int eventType, int flags);
     }
 
     // Runs on UI thread.