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

Commit 8f626a19 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 4082512 IAE "pointerIndex out of range" while zooming over 

flashplayer in browser

Fix an issue where gestures weren't being fully canceled by webkit to
the multitouch detector. This will prevent ScaleGestureDetector from
attempting to resume its regularly scheduled gesture already in
progress.

Change-Id: Id4881eeb1df8414dfa23174481bd7dc70fd08fee
parent cf63b66c

core/java/android/webkit/WebView.java

+28 −28
Original line number Diff line number Diff line
@@ -5955,10 +5955,9 @@ public class WebView extends AbsoluteLayout 
        mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);

        cancelLongPress();

        mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);

        mPreventDefault = PREVENT_DEFAULT_IGNORE;

    }



    private void handleMultiTouchInWebView(MotionEvent ev) {

    void handleMultiTouchInWebView(MotionEvent ev) {

        if (DebugFlags.WEB_VIEW) {

            Log.v(LOGTAG, "multi-touch: " + ev + " at " + ev.getEventTime()

                + " mTouchMode=" + mTouchMode
@@ -5976,6 +5975,7 @@ public class WebView extends AbsoluteLayout 
        float x = ev.getX();

        float y = ev.getY();



        if (mPreventDefault != PREVENT_DEFAULT_YES) {

            detector.onTouchEvent(ev);



            if (detector.isInProgress()) {
@@ -5996,6 +5996,7 @@ public class WebView extends AbsoluteLayout 
                    mVelocityTracker = VelocityTracker.obtain();

                }

            }

        }



        int action = ev.getActionMasked();

        if (action == MotionEvent.ACTION_POINTER_DOWN) {
@@ -7292,12 +7293,14 @@ public class WebView extends AbsoluteLayout 
        }



        private void dropStaleGestures(MotionEvent ev, long sequence) {

            if (ev != null && ev.getAction() == MotionEvent.ACTION_DOWN &&

                    mTouchEventQueue != null) {

            if (mTouchEventQueue == null) return;



            MotionEvent nextQueueEvent = mTouchEventQueue.mTed != null ?

                    mTouchEventQueue.mTed.mMotionEvent : mTouchEventQueue.mEvent;



            if (ev != null && ev.getAction() == MotionEvent.ACTION_DOWN && nextQueueEvent != null) {

                long eventTime = ev.getEventTime();

                long nextQueueTime = mTouchEventQueue.mTed != null ?

                        mTouchEventQueue.mTed.mMotionEvent.getEventTime() :

                        mTouchEventQueue.mEvent.getEventTime();

                long nextQueueTime = nextQueueEvent.getEventTime();

                if (eventTime > nextQueueTime + QUEUED_GESTURE_TIMEOUT) {

                    Log.w(LOGTAG, "Got ACTION_DOWN but still waiting on stale event. " +

                            "Ignoring previous queued events.");
@@ -7340,7 +7343,7 @@ public class WebView extends AbsoluteLayout 
                handleMultiTouchInWebView(ev);

            } else {

                final ScaleGestureDetector detector = mZoomManager.getMultiTouchGestureDetector();

                if (detector != null) {

                if (detector != null && mPreventDefault != PREVENT_DEFAULT_YES) {

                    // ScaleGestureDetector needs a consistent event stream to operate properly.

                    // It won't take any action with fewer than two pointers, but it needs to

                    // update internal bookkeeping state.
@@ -7373,10 +7376,7 @@ public class WebView extends AbsoluteLayout 
                }

            } else {

                if (ted.mPoints.length > 1) {  // multi-touch

                    if (ted.mAction == MotionEvent.ACTION_POINTER_UP &&

                            ted.mMotionEvent.getPointerCount() == 2) {

                    }

                    if (!ted.mNativeResult) {

                    if (!ted.mNativeResult && mPreventDefault != PREVENT_DEFAULT_YES) {

                        mPreventDefault = PREVENT_DEFAULT_NO;

                        handleMultiTouchInWebView(ted.mMotionEvent);

                    } else {