| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
|
| 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 5589d358acd542d7b04e3a5bd85200a060d37fe7..78edfc3979e56df33abdb2253986f45fff07a6f6 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
|
| @@ -957,42 +957,42 @@ class ContentViewGestureHandler implements LongPressDelegate {
|
| return EVENT_NOT_FORWARDED;
|
| }
|
|
|
| - private boolean processTouchEvent(MotionEvent event) {
|
| - boolean handled = false;
|
| - // The last "finger up" is an end to scrolling but may not be
|
| - // an end to movement (e.g. fling scroll). We do not tell
|
| - // native code to end scrolling until we are sure we did not
|
| - // fling.
|
| - boolean possiblyEndMovement = false;
|
| - // "Last finger raised" could be an end to movement. However,
|
| - // give the mSimpleTouchDetector a chance to continue
|
| - // scrolling with a fling.
|
| - if (event.getAction() == MotionEvent.ACTION_UP
|
| - || event.getAction() == MotionEvent.ACTION_CANCEL) {
|
| - if (mTouchScrolling) {
|
| - possiblyEndMovement = true;
|
| - }
|
| - }
|
| -
|
| - mLongPressDetector.cancelLongPressIfNeeded(event);
|
| - mLongPressDetector.startLongPressTimerIfNeeded(event);
|
| -
|
| - // Use the framework's GestureDetector to detect pans and zooms not already
|
| - // handled by the WebKit touch events gesture manager.
|
| - if (canHandle(event)) {
|
| - handled |= mGestureDetector.onTouchEvent(event);
|
| - if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
| - mCurrentDownEvent = MotionEvent.obtain(event);
|
| - }
|
| - }
|
| -
|
| - handled |= mZoomManager.processTouchEvent(event);
|
| -
|
| - if (possiblyEndMovement && !handled) {
|
| - endTouchScrollIfNecessary(event.getEventTime(), true);
|
| - }
|
| -
|
| - return handled;
|
| + private void processTouchEvent(MotionEvent event) {
|
| + // boolean handled = false;
|
| + // // The last "finger up" is an end to scrolling but may not be
|
| + // // an end to movement (e.g. fling scroll). We do not tell
|
| + // // native code to end scrolling until we are sure we did not
|
| + // // fling.
|
| + // boolean possiblyEndMovement = false;
|
| + // // "Last finger raised" could be an end to movement. However,
|
| + // // give the mSimpleTouchDetector a chance to continue
|
| + // // scrolling with a fling.
|
| + // if (event.getAction() == MotionEvent.ACTION_UP
|
| + // || event.getAction() == MotionEvent.ACTION_CANCEL) {
|
| + // if (mTouchScrolling) {
|
| + // possiblyEndMovement = true;
|
| + // }
|
| + // }
|
| +
|
| + // mLongPressDetector.cancelLongPressIfNeeded(event);
|
| + // mLongPressDetector.startLongPressTimerIfNeeded(event);
|
| +
|
| + // // Use the framework's GestureDetector to detect pans and zooms not already
|
| + // // handled by the WebKit touch events gesture manager.
|
| + // if (canHandle(event)) {
|
| + // handled |= mGestureDetector.onTouchEvent(event);
|
| + // if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
| + // mCurrentDownEvent = MotionEvent.obtain(event);
|
| + // }
|
| + // }
|
| +
|
| + // handled |= mZoomManager.processTouchEvent(event);
|
| +
|
| + // if (possiblyEndMovement && !handled) {
|
| + // endTouchScrollIfNecessary(event.getEventTime(), true);
|
| + // }
|
| +
|
| + // return handled;
|
| }
|
|
|
| /**
|
| @@ -1000,6 +1000,7 @@ class ContentViewGestureHandler implements LongPressDelegate {
|
| * @param ackResult The status acknowledgment code.
|
| */
|
| void confirmTouchEvent(int ackResult) {
|
| + Log.e("ContentViewGestureHandler", "Unqueue event");
|
| try {
|
| TraceEvent.begin("confirmTouchEvent");
|
|
|
|
|