commit dee9d9ab9f8843bdbc1fc5d29e92c12a2d0407b2
author John Reck <jreck@google.com> Fri May 11 14:23:18 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 11 14:23:18 2012 -0700
tree 270da1e7032dc542b67c842df055f1c14597fe51
parent b12b6b5116e3d76474296b45f570693bb10d6c99
parent 387c2e8d425651475c674018951a4047bf4f3cb4

Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev

core/java/android/webkit/WebViewInputDispatcher.java

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 @@
 
             DispatchEvent d = obtainDispatchEventLocked(eventToEnqueue, eventType, 0,
                     webKitXOffset, webKitYOffset, webKitScale);
+            updateStateTrackersLocked(d, event);
             enqueueEventLocked(d);
         }
         return true;
@@ -787,7 +788,6 @@
 
                 flags = d.mFlags;
 
-                updateStateTrackersLocked(d, event);
                 if (event == d.mEvent) {
                     d.mEvent = null; // retain ownership of event, don't recycle it yet
                 }