content: Populate WebPointerProperties with stylus details from ui::MouseEvent

content/browser/renderer_host/web_input_event_aura.cc

Index: content/browser/renderer_host/web_input_event_aura.cc
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc
index bbad8c7729de5201641ca854491549d3ff0f6816..6fa39c980e58ebc0b418e7ee18337551f29b613e 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/content/browser/renderer_host/web_input_event_aura.cc
@@ -48,6 +48,22 @@ blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(
   return static_cast<blink::WebInputEvent::Modifiers>(0);
 }
 
+blink::WebPointerProperties::PointerType EventPointerTypeToWebPointerType(
+    ui::EventPointerType pointer_type) {
+  switch (pointer_type) {
+    case ui::EventPointerType::POINTER_TYPE_UNKNOWN:
+      return blink::WebPointerProperties::PointerType::PointerTypeUnknown;
+    case ui::EventPointerType::POINTER_TYPE_MOUSE:
+      return blink::WebPointerProperties::PointerType::PointerTypeMouse;
+    case ui::EventPointerType::POINTER_TYPE_PEN:
+      return blink::WebPointerProperties::PointerType::PointerTypePen;
+    case ui::EventPointerType::POINTER_TYPE_TOUCH:
+      return blink::WebPointerProperties::PointerType::PointerTypeTouch;
+  }
+  NOTREACHED() << "Unexpected EventPointerType";
+  return blink::WebPointerProperties::PointerType::PointerTypeUnknown;
+}
+
 }  // namespace
 
 #if defined(OS_WIN)
@@ -155,11 +171,6 @@ blink::WebGestureEvent MakeWebGestureEventFromAuraEvent(
   return webkit_event;
 }
 
-blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
-    const ui::MouseEvent& event);
-blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
-    const ui::MouseWheelEvent& event);
-
 // General approach:
 //
 // ui::Event only carries a subset of possible event data provided to Aura by
@@ -379,6 +390,12 @@ blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
       break;
   }
 
+  webkit_event.tiltX = roundf(event.pointer_details().tilt_x());
+  webkit_event.tiltY = roundf(event.pointer_details().tilt_y());
+  webkit_event.force = event.pointer_details().force();
+  webkit_event.pointerType =
+      EventPointerTypeToWebPointerType(event.pointer_details().pointer_type());
+
   return webkit_event;
 }
 
@@ -402,6 +419,12 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
+  webkit_event.tiltX = roundf(event.pointer_details().tilt_x());
+  webkit_event.tiltY = roundf(event.pointer_details().tilt_y());
+  webkit_event.force = event.pointer_details().force();
+  webkit_event.pointerType =
+      EventPointerTypeToWebPointerType(event.pointer_details().pointer_type());
+
   return webkit_event;
 }