Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Reck
2012-05-11 14:23:18 -07:00
committed by Android (Google) Code Review
parent b12b6b5116 387c2e8d42
commit dee9d9ab9f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebViewInputDispatcher.java
View File

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