Add the pointer type of pen to the synthetic WebMousEvent

content/browser/renderer_host/input/synthetic_mouse_driver.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.
 
 #include "content/browser/renderer_host/input/synthetic_mouse_driver.h"
 
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
 
 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() {}
 
 void SyntheticMouseDriver::DispatchEvent(SyntheticGestureTarget* target,
                                          const base::TimeTicks& timestamp) {
   mouse_event_.setTimeStampSeconds(ConvertTimestampToSeconds(timestamp));
   target->DispatchInputEventToPlatform(mouse_event_);
 }
 
 void SyntheticMouseDriver::Press(float x,
                                  float y,
                                  int index,
                                  SyntheticPointerActionParams::Button button) {
   DCHECK_EQ(index, 0);
   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);
   last_modifiers_ = modifiers | last_modifiers_;
 }
 
 void SyntheticMouseDriver::Move(float x, float y, int index) {
   DCHECK_EQ(index, 0);
   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;
 }
 
 void SyntheticMouseDriver::Release(
     int index,
     SyntheticPointerActionParams::Button button) {
   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);
   last_modifiers_ =
       last_modifiers_ &
       (~SyntheticPointerActionParams::GetWebMouseEventModifier(button));
 }
 
 bool SyntheticMouseDriver::UserInputCheck(
     const SyntheticPointerActionParams& params) const {
@@ skipping 16 matching lines @@
   if (params.pointer_action_type() ==
           SyntheticPointerActionParams::PointerActionType::RELEASE &&
       mouse_event_.clickCount <= 0) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace content