Upstream hooks for javascript touch handlers on Android.

content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Pair;
@@ skipping 49 matching lines @@
     private final MotionEventDelegate mMotionEventDelegate;
 
     // Queue of motion events. If the boolean value is true, it means
     // that the event has been offered to the native side but not yet acknowledged. If the
     // value is false, it means the touch event has not been offered
     // to the native side and can be immediately processed.
     private final Deque<Pair<MotionEvent, Boolean>> mPendingMotionEvents =
             new ArrayDeque<Pair<MotionEvent, Boolean>>();
 
     // Has WebKit told us the current page requires touch events.
-    private boolean mNeedTouchEvents = false;
+    private boolean mHasTouchHandlers = false;
 
     // Remember whether onShowPress() is called. If it is not, in onSingleTapConfirmed()
     // we will first show the press state, then trigger the click.
     private boolean mShowPressIsCalled;
 
     // TODO(klobag): this is to avoid a bug in GestureDetector. With multi-touch,
     // mAlwaysInTapRegion is not reset. So when the last finger is up, onSingleTapUp()
     // will be mistakenly fired.
     private boolean mIgnoreSingleTap;
 
@@ skipping 518 matching lines @@
             // processTouchEvent asynchronously.
             TraceEvent.end("onTouchEvent");
             return true;
         }
         return processTouchEvent(event);
     }
 
     /**
      * Sets the flag indicating that the content has registered listeners for touch events.
      */
-    void didSetNeedTouchEvents(boolean needTouchEvents) {
-        mNeedTouchEvents = needTouchEvents;
+    void hasTouchEventHandlers(boolean hasTouchHandlers) {
+        mHasTouchHandlers = hasTouchHandlers;
         // When mainframe is loading, FrameLoader::transitionToCommitted will
-        // call this method to set mNeedTouchEvents to false. We use this as
+        // call this method to set mHasTouchHandlers to false. We use this as
         // an indicator to clear the pending motion events so that events from
         // the previous page will not be carried over to the new page.
-        if (!mNeedTouchEvents) mPendingMotionEvents.clear();
+        if (!mHasTouchHandlers) mPendingMotionEvents.clear();
     }
 
     private boolean offerTouchEventToJavaScript(MotionEvent event) {
         mLongPressDetector.onOfferTouchEventToJavaScript(event);
 
-        if (!mNeedTouchEvents) return false;
+        if (!mHasTouchHandlers) return false;
 
         if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {
             // Only send move events if the move has exceeded the slop threshold.
             if (!mLongPressDetector.confirmOfferMoveEventToJavaScript(event)) {
                 return true;
             }
             // Avoid flooding the renderer process with move events: if the previous pending
             // command is also a move (common case), skip sending this event to the webkit
             // side and collapse it into the pending event.
             Pair<MotionEvent, Boolean> previousEvent = mPendingMotionEvents.peekLast();
@@ skipping 111 matching lines @@
     /**
      * @return Whether the ContentViewGestureHandler can handle a MotionEvent right now. True only
      * if it's the start of a new stream (ACTION_DOWN), or a continuation of the current stream.
      */
     boolean canHandle(MotionEvent ev) {
         return ev.getAction() == MotionEvent.ACTION_DOWN ||
                 (mCurrentDownEvent != null && mCurrentDownEvent.getDownTime() == ev.getDownTime());
     }
 
 }