Add the pointer type of pen to the synthetic WebMousEvent

content/browser/renderer_host/input/synthetic_mouse_driver.cc

Index: content/browser/renderer_host/input/synthetic_mouse_driver.cc
diff --git a/content/browser/renderer_host/input/synthetic_mouse_driver.cc b/content/browser/renderer_host/input/synthetic_mouse_driver.cc
index bc3537afc8b8dea677f3e3a4f9b438ac4327d64d..e1633e9287664f247fd6f2416ee9aac92de367b8 100644
--- a/content/browser/renderer_host/input/synthetic_mouse_driver.cc
+++ b/content/browser/renderer_host/input/synthetic_mouse_driver.cc
@@ -8,7 +8,29 @@
 
 namespace content {
 
-SyntheticMouseDriver::SyntheticMouseDriver() : last_modifiers_(0) {}
+namespace {
+
+blink::WebPointerProperties::PointerType GetWebPointerType(
+    SyntheticGestureParams::GestureSourceType gesture_source_type) {
+  DCHECK(gesture_source_type == SyntheticGestureParams::MOUSE_INPUT ||
+         gesture_source_type == SyntheticGestureParams::PEN_INPUT);

[tdresser, 2017/01/25 15:22:46]

This DCHECK is redundant with the NOTREACHED at the bottom. I'd get rid of the
DCHECK.

[lanwei, 2017/01/26 02:55:40]

Done.

+  if (gesture_source_type == SyntheticGestureParams::MOUSE_INPUT)
+    return blink::WebPointerProperties::PointerType::Mouse;
+  if (gesture_source_type == SyntheticGestureParams::PEN_INPUT)
+    return blink::WebPointerProperties::PointerType::Pen;
+  NOTREACHED();
+  return blink::WebPointerProperties::PointerType::Unknown;
+}
+}
+
+SyntheticMouseDriver::SyntheticMouseDriver()
+    : last_modifiers_(0),
+      pointer_type_(blink::WebPointerProperties::PointerType::Mouse) {}
+
+SyntheticMouseDriver::SyntheticMouseDriver(
+    SyntheticGestureParams::GestureSourceType gesture_source_type)
+    : last_modifiers_(0),
+      pointer_type_(GetWebPointerType(gesture_source_type)) {}
 
 SyntheticMouseDriver::~SyntheticMouseDriver() {}
 
@@ -26,7 +48,8 @@ void SyntheticMouseDriver::Press(float x,
   int modifiers =
       SyntheticPointerActionParams::GetWebMouseEventModifier(button);
   mouse_event_ = SyntheticWebMouseEventBuilder::Build(
-      blink::WebInputEvent::MouseDown, x, y, modifiers | last_modifiers_);
+      blink::WebInputEvent::MouseDown, x, y, modifiers | last_modifiers_,
+      pointer_type_);
   mouse_event_.clickCount = 1;
   mouse_event_.button =
       SyntheticPointerActionParams::GetWebMouseEventButton(button);
@@ -38,7 +61,7 @@ void SyntheticMouseDriver::Move(float x, float y, int index) {
   blink::WebMouseEvent::Button button = mouse_event_.button;
   int click_count = mouse_event_.clickCount;
   mouse_event_ = SyntheticWebMouseEventBuilder::Build(
-      blink::WebInputEvent::MouseMove, x, y, last_modifiers_);
+      blink::WebInputEvent::MouseMove, x, y, last_modifiers_, pointer_type_);
   mouse_event_.button = button;
   mouse_event_.clickCount = click_count;
 }
@@ -49,7 +72,7 @@ void SyntheticMouseDriver::Release(
   DCHECK_EQ(index, 0);
   mouse_event_ = SyntheticWebMouseEventBuilder::Build(
       blink::WebInputEvent::MouseUp, mouse_event_.x, mouse_event_.y,
-      last_modifiers_);
+      last_modifiers_, pointer_type_);
   mouse_event_.clickCount = 1;
   mouse_event_.button =
       SyntheticPointerActionParams::GetWebMouseEventButton(button);