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

am 51688c51: am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev

Browse Source 
* commit '51688c51c14e7e92bc6d6139a099cf701b1608b0':
  Prevent updateStateTrackers from being affected by preventDefault()
This commit is contained in:
John Reck
2012-05-14 07:48:44 -07:00
committed by Android Git Automerger
parent d4bef4b786 51688c51c1
commit e6d1d4d4bb
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,
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
}