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

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

am 51688c51: am dee9d9ab: Merge "Prevent updateStateTrackers from being... 

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

* commit '51688c51':
  Prevent updateStateTrackers from being affected by preventDefault()
parents d4bef4b7 51688c51

core/java/android/webkit/WebViewInputDispatcher.java

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

                }

                }