Fixed missing pointerTypes for touch events.

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 50 matching lines @@
 #include "ui/gfx/geometry/size_f.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
+using blink::WebPointerProperties;
 
 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: "
                    << WebInputEventTraits::GetName(type);
       return -1;
   }
 }
 
+WebPointerProperties::PointerType ToWebPointerType(int tool_type) {

[Rick Byers, 2016/03/07 17:52:20]

I think there's an existing process for sharing enums between C++ and Java code,
not sure if hard-coded constants like this are frowned upon (at the least I
assume we'd want a comment saying what the real Java type definition is).  But
I'm fine leaving this to whoever does the OWNERS review for
content/browser/android (aelias maybe?).

[mustaq, 2016/03/07 21:50:42]

Reused the method in blink_event_util here.

[Rick Byers, 2016/03/08 15:43:37]

Ah, even better - thanks!

+  switch (tool_type) {
+    case 0:
+      return WebPointerProperties::PointerType::Unknown;
+    case 1:
+      return WebPointerProperties::PointerType::Touch;
+    case 2:
+    case 4:
+      return WebPointerProperties::PointerType::Pen;
+    case 3:
+      return WebPointerProperties::PointerType::Mouse;
+    default:
+      NOTREACHED() << "Invalid tool type: " << tool_type;
+      return WebPointerProperties::PointerType::Unknown;
+  }
+}
+
 }  // 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 809 matching lines @@
 
 float ContentViewCoreImpl::GetDpiScale() const {
   return dpi_scale_;
 }
 
 jboolean ContentViewCoreImpl::SendMouseMoveEvent(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong time_ms,
     jfloat x,
-    jfloat y) {
+    jfloat y,
+    jint tool_type) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (!rwhv)
     return false;
 
   blink::WebMouseEvent event = WebMouseEventBuilder::Build(
       WebInputEvent::MouseMove,
       blink::WebMouseEvent::ButtonNone,
-      time_ms / 1000.0, x / dpi_scale(), y / dpi_scale(), 0, 1);
+      time_ms / 1000.0, x / dpi_scale(), y / dpi_scale(), 0, 1,
+      ToWebPointerType(tool_type));
 
   rwhv->SendMouseEvent(event);
   return true;
 }
 
 jboolean ContentViewCoreImpl::SendMouseWheelEvent(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong time_ms,
     jfloat x,
@@ skipping 534 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content