[Android] Perform eager gesture recognition on MotionEvents

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index d6b7a1a5d2f13c3cfec0ba2b3d083fe0363a5809..0261e5ead28daca2aaecf76403c7dcbfa95af08c 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -15,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
+#include "content/browser/renderer_host/input/touch_to_gesture_queue.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/notification_observer.h"
@@ -32,12 +33,14 @@ class WindowAndroid;
 
 namespace content {
 class RenderWidgetHostViewAndroid;
+class TouchToGestureQueueClient;
 struct MenuItem;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
 class ContentViewCoreImpl : public ContentViewCore,
                             public NotificationObserver,
-                            public WebContentsObserver {
+                            public WebContentsObserver,
+                            public TouchToGestureQueueClient {
  public:
   static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
   ContentViewCoreImpl(JNIEnv* env,
@@ -95,11 +98,12 @@ class ContentViewCoreImpl : public ContentViewCore,
       JNIEnv* env, jobject obj) const;
   jboolean IsIncognito(JNIEnv* env, jobject obj);
   void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation);
-  jboolean SendTouchEvent(JNIEnv* env,
-                          jobject obj,
-                          jlong time_ms,
-                          jint type,
-                          jobjectArray pts);
+  void OnTouchEventHandlingBegin(JNIEnv* env,
+                                 jobject obj,
+                                 jlong time_ms,
+                                 jint type,
+                                 jobjectArray pts);
+  void OnTouchEventHandlingEnd(JNIEnv* env, jobject obj);
   jboolean SendMouseMoveEvent(JNIEnv* env,
                               jobject obj,
                               jlong time_ms,
@@ -270,9 +274,8 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   bool HasFocus();
   void ConfirmTouchEvent(InputEventAckState ack_result);
-  void UnhandledFlingStartEvent();
+  void UnhandledFlingStartEvent(float vx, float vy);
   void OnScrollUpdateGestureConsumed();
-  void HasTouchEventHandlers(bool need_touch_events);
   void OnSelectionChanged(const std::string& text);
   void OnSelectionBoundsChanged(
       const ViewHostMsg_SelectionBounds_Params& params);
@@ -332,6 +335,11 @@ class ContentViewCoreImpl : public ContentViewCore,
   // WebContentsObserver implementation.
   virtual void RenderViewReady() OVERRIDE;
 
+  // TouchToGestureQueue implementation.

[tdresser, 2014/01/14 16:25:30]

TouchToGestureQueue -> TouchToGestureQueueClient

[jdduke (slow), 2014/01/14 23:24:03]

Done.

+  virtual void ForwardTouchEvent(const blink::WebTouchEvent& event) OVERRIDE;
+  virtual void ForwardGestureEvent(
+      const blink::WebGestureEvent& event) OVERRIDE;
+
   // --------------------------------------------------------------------------
   // Other private methods and data
   // --------------------------------------------------------------------------
@@ -392,6 +400,8 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   bool geolocation_needs_pause_;
 
+  scoped_ptr<TouchToGestureQueue> touch_to_gesture_queue_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };