Set PointerType of pointer event on Windows.

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 2e0c2bbc663ed1b39270c9505827170eb01531ac..3ed96dc0fc654159953dfe11fe8321fc8cd38304 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/content/browser/renderer_host/web_input_event_aura.cc
@@ -56,10 +56,12 @@ blink::WebPointerProperties::PointerType EventPointerTypeToWebPointerType(
 #if defined(OS_WIN)
 blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent(
     const base::NativeEvent& native_event,
-    const base::TimeDelta& time_stamp);
+    const base::TimeDelta& time_stamp,
+    blink::WebPointerProperties::PointerType pointer_type);
 blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent(
     const base::NativeEvent& native_event,
-    const base::TimeDelta& time_stamp);
+    const base::TimeDelta& time_stamp,
+    blink::WebPointerProperties::PointerType pointer_type);
 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
     const base::NativeEvent& native_event,
     const base::TimeDelta& time_stamp);
@@ -138,6 +140,9 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
   if (offset_ordinal_y != 0.f && webkit_event.deltaY != 0.f)
     webkit_event.accelerationRatioY = offset_ordinal_y / webkit_event.deltaY;
+
+  webkit_event.pointerType =
+      EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
   return webkit_event;
 }
 
@@ -202,8 +207,10 @@ blink::WebMouseEvent MakeWebMouseEvent(const ui::MouseEvent& event) {
       // On Windows we have WM_ events comming from desktop and pure aura
       // events comming from metro mode.
       event.native_event().message && (event.type() != ui::ET_MOUSE_EXITED)
-          ? MakeUntranslatedWebMouseEventFromNativeEvent(event.native_event(),
-                                                         event.time_stamp())
+          ? MakeUntranslatedWebMouseEventFromNativeEvent(
+                event.native_event(), event.time_stamp(),
+                EventPointerTypeToWebPointerType(
+                    event.pointer_details().pointer_type))
           : MakeWebMouseEventFromAuraEvent(event);
 #else
       MakeWebMouseEventFromAuraEvent(event);
@@ -231,7 +238,9 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
   blink::WebMouseWheelEvent webkit_event =
       event.native_event().message
           ? MakeUntranslatedWebMouseWheelEventFromNativeEvent(
-                event.native_event(), event.time_stamp())
+                event.native_event(), event.time_stamp(),
+                EventPointerTypeToWebPointerType(
+                    event.pointer_details().pointer_type))
           : MakeWebMouseWheelEventFromAuraEvent(event);
 #else
   blink::WebMouseWheelEvent webkit_event =
@@ -264,7 +273,9 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEvent(const ui::ScrollEvent& event) {
   blink::WebMouseWheelEvent webkit_event =
       event.native_event().message
           ? MakeUntranslatedWebMouseWheelEventFromNativeEvent(
-                event.native_event(), event.time_stamp())
+                event.native_event(), event.time_stamp(),
+                EventPointerTypeToWebPointerType(
+                    event.pointer_details().pointer_type))
           : MakeWebMouseWheelEventFromAuraEvent(event);
 #else
   blink::WebMouseWheelEvent webkit_event =