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

2012-05-11 14:23:18 -07:00
parent b12b6b5116 387c2e8d42
commit dee9d9ab9f
1 changed files with 1 additions and 1 deletions
--- 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
                }