Added UMA counters for Android tool-types.

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 58 matching lines @@
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
+using ui::MotionEventAndroid;
 
 namespace content {
 
 namespace {
 
 // Describes the type and enabled state of a select popup item.
 //
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.content.browser.input
 enum PopupItemType {
@@ skipping 64 matching lines @@
     case WebInputEvent::GesturePinchUpdate:
       return GESTURE_EVENT_TYPE_PINCH_BY;
     case WebInputEvent::GestureTwoFingerTap:
     default:
       NOTREACHED() << "Invalid source gesture type: "
                    << WebInputEvent::GetName(type);
       return -1;
   }
 }
 
+void RecordToolTypeForActionDown(MotionEventAndroid& event) {
+  MotionEventAndroid::Action action = event.GetAction();
+  if (action == MotionEventAndroid::ACTION_DOWN ||
+      action == MotionEventAndroid::ACTION_POINTER_DOWN ||
+      action == MotionEventAndroid::ACTION_BUTTON_PRESS) {
+    UMA_HISTOGRAM_ENUMERATION("Event.AndroidActionDown.ToolType",
+                              event.GetToolType(0),
+                              MotionEventAndroid::TOOL_TYPE_ERASER + 1);

[rkaplow, 2016/12/02 20:19:06]

instead of tool_type_eraser, you should have a TOOL_TYPE_MAX in the enum.
Otherwise if you add to the enum this will be wrong

[mustaq, 2016/12/02 20:37:17]

Done.

+  }
+}
+
 }  // namespace
 
 // Enables a callback when the underlying WebContents is destroyed, to enable
 // nulling the back-pointer.
 class ContentViewCoreImpl::ContentViewUserData
     : public base::SupportsUserData::Data {
  public:
   explicit ContentViewUserData(ContentViewCoreImpl* content_view_core)
       : content_view_core_(content_view_core) {
   }
@@ skipping 735 matching lines @@
     jint android_tool_type_0,
     jint android_tool_type_1,
     jint android_button_state,
     jint android_meta_state,
     jboolean is_touch_handle_event) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   // Avoid synthesizing a touch event if it cannot be forwarded.
   if (!rwhv)
     return false;
 
-  ui::MotionEventAndroid::Pointer pointer0(pointer_id_0,
+  MotionEventAndroid::Pointer pointer0(pointer_id_0,
                                        pos_x_0,
                                        pos_y_0,
                                        touch_major_0,
                                        touch_minor_0,
                                        orientation_0,
                                        tilt_0,
                                        android_tool_type_0);
-  ui::MotionEventAndroid::Pointer pointer1(pointer_id_1,
+  MotionEventAndroid::Pointer pointer1(pointer_id_1,
                                        pos_x_1,
                                        pos_y_1,
                                        touch_major_1,
                                        touch_minor_1,
                                        orientation_1,
                                        tilt_1,
                                        android_tool_type_1);
-  ui::MotionEventAndroid event(1.f / dpi_scale(),
+  MotionEventAndroid event(1.f / dpi_scale(),
                            env,
                            motion_event,
                            time_ms,
                            android_action,
                            pointer_count,
                            history_size,
                            action_index,
                            android_button_state,
                            android_meta_state,
                            raw_pos_x - pos_x_0,
                            raw_pos_y - pos_y_0,
                            &pointer0,
                            &pointer1);
 
+  RecordToolTypeForActionDown(event);
+
   return is_touch_handle_event ? rwhv->OnTouchHandleEvent(event)
                                : rwhv->OnTouchEvent(event);
 }
 
 jboolean ContentViewCoreImpl::SendMouseEvent(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong time_ms,
     jint android_action,
     jfloat x,
     jfloat y,
     jint pointer_id,
     jfloat pressure,
     jfloat orientation,
     jfloat tilt,
     jint android_changed_button,
     jint android_button_state,
     jint android_meta_state,
     jint android_tool_type) {
 
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (!rwhv)
     return false;
 
   // Construct a motion_event object minimally, only to convert the raw
   // parameters to ui::MotionEvent values. Since we used only the cached values
   // at index=0, it is okay to even pass a null event to the constructor.
-  ui::MotionEventAndroid::Pointer pointer0(
+  MotionEventAndroid::Pointer pointer0(
       pointer_id, x, y, 0.0f /* touch_major */, 0.0f /* touch_minor */,
       orientation, tilt, android_tool_type);
 
-  ui::MotionEventAndroid motion_event(1.f / dpi_scale(),
+  MotionEventAndroid motion_event(1.f / dpi_scale(),
       env,
       nullptr /* event */,
       time_ms,
       android_action,
       1 /* pointer_count */,
       0 /* history_size */,
       0 /* action_index */,
       android_button_state,
       android_meta_state,
       0 /* raw_offset_x_pixels */,
       0 /* raw_offset_y_pixels */,
       &pointer0,
       nullptr);
 
+  RecordToolTypeForActionDown(motion_event);
+
   // Note: This relies on identical button enum values in MotionEvent and
   // MotionEventAndroid.
   rwhv->SendMouseEvent(motion_event, android_changed_button);
 
   return true;
 }
 
 jboolean ContentViewCoreImpl::SendMouseWheelEvent(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
@@ skipping 593 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content