Pass MotionEvent tool type to Blink.

This maps MotionEvent tool type to PointerEvent pointerType and passes
that to WebTouchPoints.

This CL is a part of a patch series:
 1. https://codereview.chromium.org/1253183005/
    for new WebPointerProperties fields
 2. https://codereview.chromium.org/1260693003/
    for eventSender web pointer property support
 3. https://codereview.chromium.org/1192463008/
    for handling pointer type in Blink event handlers
 4. https://codereview.chromium.org/1190013002/ (this)

BUG=514360

Review URL: https://codereview.chromium.org/1190013002

Cr-Commit-Position: refs/heads/master@{#342992}

content/browser/renderer_host/input/motion_event_web.cc

@@ -14,6 +14,7 @@
 #include "content/common/input/web_touch_event_traits.h"
 
 using blink::WebInputEvent;
+using blink::WebPointerProperties;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
@@ -157,9 +158,23 @@ base::TimeTicks MotionEventWeb::GetEventTime() const {
 
 ui::MotionEvent::ToolType MotionEventWeb::GetToolType(
     size_t pointer_index) const {
-  // TODO(jdduke): Plumb tool type from the platform event, crbug.com/404128.
   DCHECK_LT(pointer_index, GetPointerCount());
-  return TOOL_TYPE_UNKNOWN;
+
+  const WebPointerProperties& pointer = event_.touches[pointer_index];
+
+  switch (pointer.pointerType) {
+    case WebPointerProperties::PointerTypeUnknown:
+      return TOOL_TYPE_UNKNOWN;
+    case WebPointerProperties::PointerTypeMouse:
+      return TOOL_TYPE_MOUSE;
+    case WebPointerProperties::PointerTypePen:
+      return TOOL_TYPE_STYLUS;
+    case WebPointerProperties::PointerTypeTouch:
+      return TOOL_TYPE_FINGER;
+    default:
+      NOTREACHED() << "Unhandled pointer type " << pointer.pointerType;
+      return TOOL_TYPE_UNKNOWN;
+  }
 }
 
 int MotionEventWeb::GetButtonState() const {

ui/events/blink/blink_event_util.cc

@@ -71,10 +71,30 @@ WebTouchPoint::State ToWebTouchPointState(const MotionEvent& event,
   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() << "Invalid MotionEvent::ToolType = "
+               << event.GetToolType(pointer_index);
+  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);