Fixed missing pointerTypes for touch events.

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 <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/events/gesture_event_details.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
+using blink::WebPointerProperties;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace ui {
 namespace {
 
 WebInputEvent::Type ToWebInputEventType(MotionEvent::Action action) {
   switch (action) {
     case MotionEvent::ACTION_DOWN:
       return WebInputEvent::TouchStart;
@@ skipping 38 matching lines @@
                  ? WebTouchPoint::StateReleased
                  : WebTouchPoint::StateStationary;
     case MotionEvent::ACTION_NONE:
       NOTREACHED();
       return WebTouchPoint::StateUndefined;
   }
   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::PointerType::Unknown;
-    case MotionEvent::TOOL_TYPE_FINGER:
-      return WebTouchPoint::PointerType::Touch;
-    case MotionEvent::TOOL_TYPE_STYLUS:
-      return WebTouchPoint::PointerType::Pen;
-    case MotionEvent::TOOL_TYPE_MOUSE:
-      return WebTouchPoint::PointerType::Mouse;
-    case MotionEvent::TOOL_TYPE_ERASER:
-      return WebTouchPoint::PointerType::Unknown;
-  }
-  NOTREACHED() << "Invalid MotionEvent::ToolType = "
-               << event.GetToolType(pointer_index);
-  return WebTouchPoint::PointerType::Unknown;
-}
-
 WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
                                   size_t pointer_index) {
   WebTouchPoint touch;
   touch.id = event.GetPointerId(pointer_index);
-  touch.pointerType = ToWebTouchPointPointerType(event, pointer_index);
+  touch.pointerType = ToWebPointerType(event.GetToolType(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 337 matching lines @@
         break;
 
       // TODO(oshima): Find out if ContextMenu needs to be scaled.
       default:
         break;
     }
   }
   return scaled_event;
 }
 
+WebPointerProperties::PointerType ToWebPointerType(
+    MotionEvent::ToolType tool_type) {
+  switch (tool_type) {
+    case MotionEvent::TOOL_TYPE_UNKNOWN:
+      return WebPointerProperties::PointerType::Unknown;
+    case MotionEvent::TOOL_TYPE_FINGER:
+      return WebPointerProperties::PointerType::Touch;
+    case MotionEvent::TOOL_TYPE_STYLUS:
+      return WebPointerProperties::PointerType::Pen;
+    case MotionEvent::TOOL_TYPE_MOUSE:
+      return WebPointerProperties::PointerType::Mouse;
+    case MotionEvent::TOOL_TYPE_ERASER:
+      return WebPointerProperties::PointerType::Unknown;
+  }
+  NOTREACHED() << "Invalid MotionEvent::ToolType = " << tool_type;
+  return WebPointerProperties::PointerType::Unknown;
+}
+
 }  // namespace ui