Pass MotionEvent tool type to Blink.

ui/events/blink/blink_event_util.cc

 // Copyright 2015 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/blink/blink_event_util.h"
 
 #include <cmath>
@@ skipping 53 matching lines @@
                  : WebTouchPoint::StateStationary;
     case MotionEvent::ACTION_POINTER_UP:
       return static_cast<int>(pointer_index) == event.GetActionIndex()
                  ? WebTouchPoint::StateReleased
                  : WebTouchPoint::StateStationary;
   }
   NOTREACHED() << "Invalid MotionEvent::Action.";
   return WebTouchPoint::StateUndefined;
 }
 
+WebTouchPoint::PointerType ToWebTouchPointPointerType(
+    const MotionEvent& event, size_t pointer_index) {
+  switch (event.GetToolType(pointer_index)) {
+    case MotionEvent::TOOL_TYPE_UNKNOWN:
+      return WebTouchPoint::PointerTypeUnknown;
+    case MotionEvent::TOOL_TYPE_FINGER:
+      return WebTouchPoint::PointerTypeTouch;
+    case MotionEvent::TOOL_TYPE_STYLUS:
+      return WebTouchPoint::PointerTypePen;
+    case MotionEvent::TOOL_TYPE_MOUSE:
+      return WebTouchPoint::PointerTypeMouse;
+    case MotionEvent::TOOL_TYPE_ERASER:
+      return WebTouchPoint::PointerTypeUnknown;
+  }
+  NOTREACHED();

[sadrul, 2015/08/11 19:33:34]

NOTREACHED() << "Invalid MotionEvent::ToolType = " <<
event.GetToolType(pointer_index);

[USE eero AT chromium.org, 2015/08/12 07:50:11]

Done.

+  return WebTouchPoint::PointerTypeUnknown;
+}
+
 WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
                                   size_t pointer_index) {
   WebTouchPoint touch;
   touch.id = event.GetPointerId(pointer_index);
+  touch.pointerType = ToWebTouchPointPointerType(event, pointer_index);
   touch.state = ToWebTouchPointState(event, pointer_index);
   touch.position.x = event.GetX(pointer_index);
   touch.position.y = event.GetY(pointer_index);
   touch.screenPosition.x = event.GetRawX(pointer_index);
   touch.screenPosition.y = event.GetRawY(pointer_index);
 
   // A note on touch ellipse specifications:
   //
   // Android MotionEvent provides the major and minor axes of the touch ellipse,
   // as well as the orientation of the major axis clockwise from vertical, in
@@ skipping 222 matching lines @@
 }
 
 WebGestureEvent CreateWebGestureEventFromGestureEventData(
     const GestureEventData& data) {
   return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(),
                                gfx::PointF(data.x, data.y),
                                gfx::PointF(data.raw_x, data.raw_y), data.flags);
 }
 
 }  // namespace ui