Refine tap disambiguation UMA to track same-node/different-node.

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 <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 961 matching lines @@
 void ContentViewCoreImpl::FlingCancel(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj,
                                       jlong time_ms) {
   WebGestureEvent event = MakeGestureEvent(
       WebInputEvent::GestureFlingCancel, time_ms, 0, 0);
   event.data.flingCancel.preventBoosting = true;
 
   SendGestureEvent(event);
 }
 
-void ContentViewCoreImpl::SingleTap(JNIEnv* env,
-                                    const JavaParamRef<jobject>& obj,
-                                    jlong time_ms,
-                                    jfloat x,
-                                    jfloat y) {
-  // Tap gestures should always be preceded by a TapDown, ensuring consistency
-  // with the touch-based gesture detection pipeline.
-  WebGestureEvent tap_down_event = MakeGestureEvent(
-      WebInputEvent::GestureTapDown, time_ms, x, y);
-  tap_down_event.data.tap.tapCount = 1;
-  SendGestureEvent(tap_down_event);
-
-  WebGestureEvent tap_event = MakeGestureEvent(
-      WebInputEvent::GestureTap, time_ms, x, y);
-  tap_event.data.tap.tapCount = 1;
-  SendGestureEvent(tap_event);
-}
-
 void ContentViewCoreImpl::DoubleTap(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     jlong time_ms,
                                     jfloat x,
                                     jfloat y) {
   WebGestureEvent event = MakeGestureEvent(
       WebInputEvent::GestureDoubleTap, time_ms, x, y);
   // Set the tap count to 1 even for DoubleTap, in order to be consistent with
   // double tap behavior on a mobile viewport. See crbug.com/234986 for context.
   event.data.tap.tapCount = 1;
 
   SendGestureEvent(event);
 }
 
-void ContentViewCoreImpl::LongPress(JNIEnv* env,
-                                    const JavaParamRef<jobject>& obj,
-                                    jlong time_ms,
-                                    jfloat x,
-                                    jfloat y) {
-  WebGestureEvent event = MakeGestureEvent(
-      WebInputEvent::GestureLongPress, time_ms, x, y);
+void ContentViewCoreImpl::ResolveTapDisambiguation(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jlong time_ms,
+    jfloat x,
+    jfloat y,
+    jboolean is_long_press) {
+  RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
+  if (!rwhv)
+    return;
 
-  SendGestureEvent(event);
+  rwhv->ResolveTapDisambiguation(time_ms / 1000.0,
+                                 gfx::Point(x / dpi_scale_, y / dpi_scale_),
+                                 is_long_press);
 }
 
 void ContentViewCoreImpl::PinchBegin(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj,
                                      jlong time_ms,
                                      jfloat x,
                                      jfloat y) {
   WebGestureEvent event = MakeGestureEvent(
       WebInputEvent::GesturePinchBegin, time_ms, x, y);
   SendGestureEvent(event);
@@ skipping 377 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content