Set PointerType of pointer event on Windows.

content/browser/renderer_host/web_input_event_aura.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/renderer_host/web_input_event_aura.h"
 
 #include "build/build_config.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 38 matching lines @@
   }
   NOTREACHED() << "Unexpected EventPointerType";
   return blink::WebPointerProperties::PointerType::Unknown;
 }
 
 }  // namespace
 
 #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);
 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent(
     const base::NativeEvent& native_event,
     const base::TimeDelta& time_stamp);
 #endif
 
 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
     const ui::KeyEvent& event) {
@@ skipping 58 matching lines @@
     offset_ordinal_x = event.x_offset_ordinal();
     offset_ordinal_y = event.y_offset_ordinal();
   }
 
   if (offset_ordinal_x != 0.f && webkit_event.deltaX != 0.f)
     webkit_event.accelerationRatioX = offset_ordinal_x / webkit_event.deltaX;
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   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;
 }
 
 blink::WebGestureEvent MakeWebGestureEventFromAuraEvent(
     const ui::ScrollEvent& event) {
   blink::WebGestureEvent webkit_event;
 
   switch (event.type()) {
     case ui::ET_SCROLL_FLING_START:
       webkit_event.type = blink::WebInputEvent::GestureFlingStart;
@@ skipping 44 matching lines @@
 // ui::MouseEvent. This will not be necessary once only XInput2 is supported.
 //
 
 blink::WebMouseEvent MakeWebMouseEvent(const ui::MouseEvent& event) {
   // Construct an untranslated event from the platform event data.
   blink::WebMouseEvent webkit_event =
 #if defined(OS_WIN)
       // 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);
 #endif
   // Replace the event's coordinate fields with translated position data from
   // |event|.
   webkit_event.windowX = webkit_event.x = event.x();
   webkit_event.windowY = webkit_event.y = event.y();
 
 #if defined(OS_WIN)
   if (event.native_event().message)
     return webkit_event;
 #endif
   const gfx::Point screen_point = GetScreenLocationFromEvent(event);
   webkit_event.globalX = screen_point.x();
   webkit_event.globalY = screen_point.y();
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
     const ui::MouseWheelEvent& event) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   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 =
       MakeWebMouseWheelEventFromAuraEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
   // |event|.
   webkit_event.windowX = webkit_event.x = event.x();
   webkit_event.windowY = webkit_event.y = event.y();
@@ skipping 12 matching lines @@
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEvent(const ui::ScrollEvent& event) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   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 =
       MakeWebMouseWheelEventFromAuraEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
   // |event|.
   webkit_event.windowX = webkit_event.x = event.x();
   webkit_event.windowY = webkit_event.y = event.y();
@@ skipping 154 matching lines @@
   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;
 }
 
 }  // namespace content