[Android] Share gesture types between Java and C++

content/browser/android/content_view_core_impl.cc

 // 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.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "content/browser/android/content_video_view.h"
+#include "content/browser/android/gesture_event_type.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
@@ skipping 93 matching lines @@
     //  focus (e.g., following a GestureLongPress).
     case WebInputEvent::GestureTapCancel:
       return true;
     default:
       break;
   }
   return false;
 }
 
 int ToContentViewGestureHandlerType(WebInputEvent::Type type) {
-  // These values should match exactly those in ContentViewGestureHandler.
-  enum ContentViewGestureHandlerType {
-    GESTURE_SHOW_PRESS = 0,
-    GESTURE_DOUBLE_TAP = 1,
-    GESTURE_SINGLE_TAP_UP = 2,
-    GESTURE_SINGLE_TAP_CONFIRMED = 3,
-    GESTURE_SINGLE_TAP_UNCONFIRMED = 4,
-    GESTURE_LONG_PRESS = 5,
-    GESTURE_SCROLL_START = 6,
-    GESTURE_SCROLL_BY = 7,
-    GESTURE_SCROLL_END = 8,
-    GESTURE_FLING_START = 9,
-    GESTURE_FLING_CANCEL = 10,
-    GESTURE_PINCH_BEGIN = 11,
-    GESTURE_PINCH_BY = 12,
-    GESTURE_PINCH_END = 13,
-    GESTURE_TAP_CANCEL = 14,
-    GESTURE_LONG_TAP = 15,
-    GESTURE_TAP_DOWN = 16
-  };
   switch (type) {
     case WebInputEvent::GestureScrollBegin:
-      return GESTURE_SCROLL_START;
+      return SCROLL_START;
     case WebInputEvent::GestureScrollEnd:
-      return GESTURE_SCROLL_END;
+      return SCROLL_END;
     case WebInputEvent::GestureScrollUpdate:
-      return GESTURE_SCROLL_BY;
+      return SCROLL_BY;
     case WebInputEvent::GestureFlingStart:
-      return GESTURE_FLING_START;
+      return FLING_START;
     case WebInputEvent::GestureFlingCancel:
-      return GESTURE_FLING_CANCEL;
+      return FLING_CANCEL;
     case WebInputEvent::GestureShowPress:
-      return GESTURE_SHOW_PRESS;
+      return SHOW_PRESS;
     case WebInputEvent::GestureTap:
-      return GESTURE_SINGLE_TAP_CONFIRMED;
+      return SINGLE_TAP_CONFIRMED;
     case WebInputEvent::GestureTapUnconfirmed:
-      return GESTURE_SINGLE_TAP_UNCONFIRMED;
+      return SINGLE_TAP_UNCONFIRMED;
     case WebInputEvent::GestureTapDown:
-      return GESTURE_TAP_DOWN;
+      return TAP_DOWN;
     case WebInputEvent::GestureTapCancel:
-      return GESTURE_TAP_CANCEL;
+      return TAP_CANCEL;
     case WebInputEvent::GestureDoubleTap:
-      return GESTURE_DOUBLE_TAP;
+      return DOUBLE_TAP;
     case WebInputEvent::GestureLongPress:
-      return GESTURE_LONG_PRESS;
+      return LONG_PRESS;
     case WebInputEvent::GestureLongTap:
-      return GESTURE_LONG_TAP;
+      return LONG_TAP;
     case WebInputEvent::GesturePinchBegin:
-      return GESTURE_PINCH_BEGIN;
+      return PINCH_BEGIN;
     case WebInputEvent::GesturePinchEnd:
-      return GESTURE_PINCH_END;
+      return PINCH_END;
     case WebInputEvent::GesturePinchUpdate:
-      return GESTURE_PINCH_BY;
+      return PINCH_BY;
     case WebInputEvent::GestureTwoFingerTap:
     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
     default:
       NOTREACHED() << "Invalid source gesture type: "
                    << WebInputEventTraits::GetName(type);
       return -1;
   };
 }
 
 }  // namespace
@@ skipping 399 matching lines @@
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
 
   switch (event.type) {
     case WebInputEvent::GestureFlingStart:
       if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) {
         Java_ContentViewCore_onFlingStartEventConsumed(env, j_obj.obj(),
             event.data.flingStart.velocityX, event.data.flingStart.velocityY);
       } else {
-        // If a scroll ends with a fling, a GESTURE_SCROLL_END is never sent.
+        // If a scroll ends with a fling, a SCROLL_END event is never sent.
         // However, if that fling went unconsumed, we still need to let the
         // listeners know that scrolling has ended.
         Java_ContentViewCore_onScrollEndEventAck(env, j_obj.obj());
       }
 
       if (ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) {
         Java_ContentViewCore_onFlingStartEventHadNoConsumer(env, j_obj.obj(),
             event.data.flingStart.velocityX, event.data.flingStart.velocityY);
       }
       break;
@@ skipping 1263 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content