Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51688c51 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by... 

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

* commit 'dee9d9ab':
  Prevent updateStateTrackers from being affected by preventDefault()
parents 47272c93 dee9d9ab

core/java/android/webkit/WebViewInputDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -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

                }