[Android] Out with the Android GR, in with the new unified C++ GR

content/browser/android/content_view_core_impl.h

 // Copyright 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
-#include "content/browser/renderer_host/input/touch_disposition_gesture_filter.h"
+#include "content/browser/renderer_host/input/content_gesture_provider.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.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"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 namespace ui {
 class ViewAndroid;
 class WindowAndroid;
 }
 
 namespace content {
 class RenderWidgetHostViewAndroid;
 struct MenuItem;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
 class ContentViewCoreImpl : public ContentViewCore,
+                            public ContentGestureProviderClient,
                             public NotificationObserver,
-                            public TouchDispositionGestureFilterClient,
                             public WebContentsObserver {
  public:
   static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
   ContentViewCoreImpl(JNIEnv* env,
                       jobject obj,
                       WebContents* web_contents,
                       ui::ViewAndroid* view_android,
                       ui::WindowAndroid* window_android);
 
   // ContentViewCore implementation.
@@ skipping 36 matching lines @@
       jstring extra_headers,
       jbyteArray post_data,
       jstring base_url_for_data_url,
       jstring virtual_url_for_data_url,
       jboolean can_load_local_resources);
   base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const;
   base::android::ScopedJavaLocalRef<jstring> GetTitle(
       JNIEnv* env, jobject obj) const;
   jboolean IsIncognito(JNIEnv* env, jobject obj);
   void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation);
-  void OnTouchEventHandlingBegin(JNIEnv* env,
-                                 jobject obj,
-                                 jobject motion_event);
-  void OnTouchEventHandlingEnd(JNIEnv* env, jobject obj);
+  jboolean OnTouchEvent(JNIEnv* env,
+                        jobject obj,
+                        jobject motion_event);
   jboolean SendMouseMoveEvent(JNIEnv* env,
                               jobject obj,
                               jlong time_ms,
                               jfloat x,
                               jfloat y);
   jboolean SendMouseWheelEvent(JNIEnv* env,
                                jobject obj,
                                jlong time_ms,
                                jfloat x,
                                jfloat y,
                                jfloat vertical_axis);
   void ScrollBegin(JNIEnv* env, jobject obj, jlong time_ms,
                    jfloat x, jfloat y, jfloat hintx, jfloat hinty);
   void ScrollEnd(JNIEnv* env, jobject obj, jlong time_ms);
   void ScrollBy(JNIEnv* env, jobject obj, jlong time_ms,
                 jfloat x, jfloat y, jfloat dx, jfloat dy);
   void FlingStart(JNIEnv* env, jobject obj, jlong time_ms,
                   jfloat x, jfloat y, jfloat vx, jfloat vy);
   void FlingCancel(JNIEnv* env, jobject obj, jlong time_ms);
   void SingleTap(JNIEnv* env, jobject obj, jlong time_ms,
                  jfloat x, jfloat y,
                  jboolean disambiguation_popup_tap);
-  void SingleTapUnconfirmed(JNIEnv* env, jobject obj, jlong time_ms,
-                            jfloat x, jfloat y);
-  void ShowPress(JNIEnv* env, jobject obj, jlong time_ms,
-                 jfloat x, jfloat y);
-  void TapCancel(JNIEnv* env, jobject obj, jlong time_ms,
-                 jfloat x, jfloat y);
-  void TapDown(JNIEnv* env, jobject obj, jlong time_ms,
-               jfloat x, jfloat y);
   void DoubleTap(JNIEnv* env, jobject obj, jlong time_ms,
                  jfloat x, jfloat y) ;
   void LongPress(JNIEnv* env, jobject obj, jlong time_ms,
                  jfloat x, jfloat y,
                  jboolean disambiguation_popup_tap);
-  void LongTap(JNIEnv* env, jobject obj, jlong time_ms,
-               jfloat x, jfloat y,
-               jboolean disambiguation_popup_tap);
   void PinchBegin(JNIEnv* env, jobject obj, jlong time_ms, jfloat x, jfloat y);
   void PinchEnd(JNIEnv* env, jobject obj, jlong time_ms);
   void PinchBy(JNIEnv* env, jobject obj, jlong time_ms,
                jfloat x, jfloat y, jfloat delta);
   void SelectBetweenCoordinates(JNIEnv* env, jobject obj,
                                 jfloat x1, jfloat y1,
                                 jfloat x2, jfloat y2);
   void MoveCaret(JNIEnv* env, jobject obj, jfloat x, jfloat y);
 
+  void ResetGestureDetectors(JNIEnv* env, jobject obj);
+  void IgnoreRemainingTouchEvents(JNIEnv* env, jobject obj);
+  void OnWindowFocusLost(JNIEnv* env, jobject obj);
+  void UpdateDoubleTapSupportForPage(JNIEnv* env,
+                                     jobject obj,
+                                     jboolean has_support);
+  void UpdateDoubleTapSupport(JNIEnv* env, jobject obj, jboolean has_support);
+  void UpdateMultiTouchZoomSupport(JNIEnv* env,
+                                   jobject obj,
+                                   jboolean has_support);
+
   void LoadIfNecessary(JNIEnv* env, jobject obj);
   void RequestRestoreLoad(JNIEnv* env, jobject obj);
   void StopLoading(JNIEnv* env, jobject obj);
   void Reload(JNIEnv* env, jobject obj, jboolean check_for_repost);
   void ReloadIgnoringCache(JNIEnv* env, jobject obj, jboolean check_for_repost);
   void CancelPendingReload(JNIEnv* env, jobject obj);
   void ContinuePendingReload(JNIEnv* env, jobject obj);
   void ClearHistory(JNIEnv* env, jobject obj);
   void EvaluateJavaScript(JNIEnv* env,
                           jobject obj,
@@ skipping 52 matching lines @@
                               bool animate);
   void ShowImeIfNeeded(JNIEnv* env, jobject obj);
 
   void ShowInterstitialPage(JNIEnv* env,
                             jobject obj,
                             jstring jurl,
                             jint delegate);
   jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj);
 
   void SetAccessibilityEnabled(JNIEnv* env, jobject obj, bool enabled);
-  void SendActionAfterDoubleTapUma(JNIEnv* env,
-                                   jobject obj,
-                                   jint type,
-                                   jboolean has_delay,
-                                   jint count);
-  void SendSingleTapUma(JNIEnv* env, jobject obj, jint type, jint count);
 
   void ExtractSmartClipData(JNIEnv* env,
                             jobject obj,
                             jint x,
                             jint y,
                             jint width,
                             jint height);
   // --------------------------------------------------------------------------
   // Public methods that call to Java via JNI
   // --------------------------------------------------------------------------
@@ skipping 83 matching lines @@
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // WebContentsObserver implementation.
   virtual void RenderViewReady() OVERRIDE;
   virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
 
-  // TouchDispositionGestureFilterClient implementation.
-  virtual void ForwardGestureEvent(
-      const blink::WebGestureEvent& event) OVERRIDE;
+  // ContentGestureProviderClient implementation.
+  virtual void OnGestureEvent(const blink::WebGestureEvent& event) OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Other private methods and data
   // --------------------------------------------------------------------------
 
   void InitWebContents();
 
   RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
 
   float GetTouchPaddingDip();
 
   blink::WebGestureEvent MakeGestureEvent(
       blink::WebInputEvent::Type type, int64 time_ms, float x, float y) const;
 
   void SendBeginFrame(base::TimeTicks frame_time);
 
   gfx::Size GetViewportSizePix() const;
   gfx::Size GetViewportSizeOffsetPix() const;
 
   void DeleteScaledSnapshotTexture();
 
   void SendGestureEvent(const blink::WebGestureEvent& event);
-  void SendSyntheticGestureEvent(const blink::WebGestureEvent& event);
 
   // Update focus state of the RenderWidgetHostView.
   void SetFocusInternal(bool focused);
 
   // Send device_orientation_ to renderer.
   void SendOrientationChangeEventInternal();
 
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;
 
@@ skipping 13 matching lines @@
   base::TimeDelta vsync_interval_;
   base::TimeDelta expected_browser_composite_time_;
 
   // The Android view that can be used to add and remove decoration layers
   // like AutofillPopup.
   ui::ViewAndroid* view_android_;
 
   // The owning window that has a hold of main application activity.
   ui::WindowAndroid* window_android_;
 
+  // Provides gesture synthesis given a stream of touch events (derived from
+  // Android MotionEvent's) and touch event acks.
+  ContentGestureProvider gesture_provider_;
+
   // The cache of device's current orientation set from Java side, this value
   // will be sent to Renderer once it is ready.
   int device_orientation_;
 
   bool geolocation_needs_pause_;
 
-  // Handles gesture dispatch as the generating touch events are ack'ed.
-  TouchDispositionGestureFilter touch_disposition_gesture_filter_;
-  bool handling_touch_event_;
-  blink::WebTouchEvent pending_touch_event_;
-  GestureEventPacket pending_gesture_packet_;
-
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_