From 387c2e8d425651475c674018951a4047bf4f3cb4 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 11 May 2012 13:50:57 -0700
Subject: Prevent updateStateTrackers from being affected by preventDefault()

 Bug: 6477996
 Calling e.preventDefault() on a javascript touch handler is apparantly
 not supposed to prevent the default gesture detector, who knew?

Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
---
 core/java/android/webkit/WebViewInputDispatcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebViewInputDispatcher.java b/core/java/android/webkit/WebViewInputDispatcher.java
index 9541435..9328d8c 100644
--- a/core/java/android/webkit/WebViewInputDispatcher.java
+++ b/core/java/android/webkit/WebViewInputDispatcher.java
@@ -334,6 +334,7 @@ final class WebViewInputDispatcher {
 
             DispatchEvent d = obtainDispatchEventLocked(eventToEnqueue, eventType, 0,
                     webKitXOffset, webKitYOffset, webKitScale);
+            updateStateTrackersLocked(d, event);
             enqueueEventLocked(d);
         }
         return true;
@@ -787,7 +788,6 @@ final class WebViewInputDispatcher {
 
                 flags = d.mFlags;
 
-                updateStateTrackersLocked(d, event);
                 if (event == d.mEvent) {
                     d.mEvent = null; // retain ownership of event, don't recycle it yet
                 }
-- 
cgit v1.1