[Touch Adjustment] Pass primary_pointer_type to WebGestureEvent and disable adjustment for stylus

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>
@@ skipping 101 matching lines @@
       return WebPointerProperties::PointerType::kPen;
     case MotionEvent::TOOL_TYPE_MOUSE:
       return WebPointerProperties::PointerType::kMouse;
     case MotionEvent::TOOL_TYPE_ERASER:
       return WebPointerProperties::PointerType::kEraser;
   }
   NOTREACHED() << "Invalid MotionEvent::ToolType = " << tool_type;
   return WebPointerProperties::PointerType::kUnknown;
 }
 
+WebPointerProperties::PointerType ToWebPointerType(
+    EventPointerType event_pointer_type) {
+  switch (event_pointer_type) {
+    case EventPointerType::POINTER_TYPE_UNKNOWN:
+      return WebPointerProperties::PointerType::kUnknown;
+    case EventPointerType::POINTER_TYPE_MOUSE:
+      return WebPointerProperties::PointerType::kMouse;
+    case EventPointerType::POINTER_TYPE_PEN:
+      return WebPointerProperties::PointerType::kPen;
+    case EventPointerType::POINTER_TYPE_TOUCH:
+      return WebPointerProperties::PointerType::kTouch;
+    case EventPointerType::POINTER_TYPE_ERASER:
+      return WebPointerProperties::PointerType::kEraser;
+    default:
+      NOTREACHED() << "Invalid EventPointerType = "
+                   << static_cast<int>(event_pointer_type);
+      return WebPointerProperties::PointerType::kUnknown;
+  }
+}
+
 WebPointerProperties::Button ToWebPointerButton(int android_button_state) {
   if (android_button_state & MotionEvent::BUTTON_PRIMARY)
     return WebPointerProperties::Button::kLeft;
   else if (android_button_state & MotionEvent::BUTTON_SECONDARY)
     return WebPointerProperties::Button::kRight;
   else if (android_button_state & MotionEvent::BUTTON_TERTIARY)
     return WebPointerProperties::Button::kMiddle;
   else if (android_button_state & MotionEvent::BUTTON_BACK)
     return WebPointerProperties::Button::kBack;
   else if (android_button_state & MotionEvent::BUTTON_FORWARD)
@@ skipping 359 matching lines @@
   DCHECK(IsContinuousGestureEvent(new_event.GetType()));
   DCHECK(IsCompatibleScrollorPinch(new_event, last_event));
   DCHECK(!second_last_event ||
          IsCompatibleScrollorPinch(new_event, *second_last_event));
 
   WebGestureEvent scroll_event(WebInputEvent::kGestureScrollUpdate,
                                new_event.GetModifiers(),
                                new_event.TimeStampSeconds());
   WebGestureEvent pinch_event;
   scroll_event.source_device = new_event.source_device;
+  scroll_event.primary_pointer_type = new_event.primary_pointer_type;
   pinch_event = scroll_event;
   pinch_event.SetType(WebInputEvent::kGesturePinchUpdate);
   pinch_event.x = new_event.GetType() == WebInputEvent::kGesturePinchUpdate
                       ? new_event.x
                       : last_event.x;
   pinch_event.y = new_event.GetType() == WebInputEvent::kGesturePinchUpdate
                       ? new_event.y
                       : last_event.y;
 
   gfx::Transform combined_scroll_pinch = GetTransformForEvent(last_event);
@@ skipping 109 matching lines @@
       break;
     case GestureDeviceType::DEVICE_TOUCHPAD:
       gesture.source_device = blink::kWebGestureDeviceTouchpad;
       break;
     case GestureDeviceType::DEVICE_UNKNOWN:
       NOTREACHED() << "Unknown device type is not allowed";
       gesture.source_device = blink::kWebGestureDeviceUninitialized;
       break;
   }
 
+  gesture.primary_pointer_type =
+      ToWebPointerType(details.primary_pointer_type());
   gesture.unique_touch_event_id = unique_touch_event_id;
 
   switch (details.type()) {
     case ET_GESTURE_SHOW_PRESS:
       gesture.SetType(WebInputEvent::kGestureShowPress);
       gesture.data.show_press.width = details.bounding_box_f().width();
       gesture.data.show_press.height = details.bounding_box_f().height();
       break;
     case ET_GESTURE_DOUBLE_TAP:
       gesture.SetType(WebInputEvent::kGestureDoubleTap);
@@ skipping 343 matching lines @@
   switch (type) {
     case blink::WebGestureEvent::kGestureScrollUpdate:
     case blink::WebGestureEvent::kGesturePinchUpdate:
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace ui