From 383b54ba88bfe638c216833f0b1c4655ad781be7 Mon Sep 17 00:00:00 2001 From: "kristianm@chromium.org" Date: Wed, 28 Aug 2013 00:20:01 +0000 Subject: Merge 219716 "Adding source POINTER to the create events before ..." > Adding source POINTER to the create events before sending them to the framework > > BUG=278445 > > Review URL: https://chromiumcodereview.appspot.com/22996011 TBR=kristianm@chromium.org Review URL: https://codereview.chromium.org/23619005 git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@219866 0039d316-1c4b-4281-b951-d872f2087c98 --- .../content/browser/ContentViewGestureHandler.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'content') diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java index 37fd170..0580af0 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java @@ -9,6 +9,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; import android.util.Log; +import android.view.InputDevice; import android.view.MotionEvent; import android.view.ViewConfiguration; @@ -814,16 +815,11 @@ class ContentViewGestureHandler implements LongPressDelegate { * FrameLoader::transitionToCommitted iff the page ever had touch handlers. */ void resetGestureHandlers() { - { - MotionEvent me = obtainActionCancelMotionEvent(); - mGestureDetector.onTouchEvent(me); - me.recycle(); - } - { - MotionEvent me = obtainActionCancelMotionEvent(); - mZoomManager.processTouchEvent(me); - me.recycle(); - } + MotionEvent me = obtainActionCancelMotionEvent(); + me.setSource(InputDevice.SOURCE_CLASS_POINTER); + mGestureDetector.onTouchEvent(me); + mZoomManager.processTouchEvent(me); + me.recycle(); mLongPressDetector.cancelLongPress(); } -- cgit v1.1