Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1523)

Unified Diff: content/browser/renderer_host/input/synthetic_mouse_driver.cc

Issue 2633233002: Add the pointer type of pen to the synthetic WebMousEvent (Closed)
Patch Set: pen type Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4db6f2deaf3639571e59d6217f89616b6047b38f..66183731f22f5598bbe0eb428d74816c6207044b 100644
--- a/content/browser/renderer_host/input/synthetic_mouse_driver.cc
+++ b/content/browser/renderer_host/input/synthetic_mouse_driver.cc
@@ -8,7 +8,28 @@
namespace content {
-SyntheticMouseDriver::SyntheticMouseDriver() {}
+namespace {
+
+blink::WebPointerProperties::PointerType GetWebPointerType(
+ SyntheticGestureParams::GestureSourceType gesture_source_type) {
+ DCHECK(gesture_source_type == SyntheticGestureParams::MOUSE_INPUT ||
+ gesture_source_type == SyntheticGestureParams::PEN_INPUT);
+ 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()
+ : pointer_type_(blink::WebPointerProperties::PointerType::Mouse) {}
+
+SyntheticMouseDriver::SyntheticMouseDriver(
+ SyntheticGestureParams::GestureSourceType gesture_source_type)
+ : pointer_type_(GetWebPointerType(gesture_source_type)) {}
SyntheticMouseDriver::~SyntheticMouseDriver() {}
@@ -21,7 +42,7 @@ void SyntheticMouseDriver::DispatchEvent(SyntheticGestureTarget* target,
void SyntheticMouseDriver::Press(float x, float y, int index) {
DCHECK_EQ(index, 0);
mouse_event_ = SyntheticWebMouseEventBuilder::Build(
- blink::WebInputEvent::MouseDown, x, y, 0);
+ blink::WebInputEvent::MouseDown, x, y, 0, pointer_type_);
mouse_event_.clickCount = 1;
}
@@ -30,7 +51,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, 0);
+ blink::WebInputEvent::MouseMove, x, y, 0, pointer_type_);
mouse_event_.button = button;
mouse_event_.clickCount = click_count;
}
@@ -38,7 +59,8 @@ void SyntheticMouseDriver::Move(float x, float y, int index) {
void SyntheticMouseDriver::Release(int index) {
DCHECK_EQ(index, 0);
mouse_event_ = SyntheticWebMouseEventBuilder::Build(
- blink::WebInputEvent::MouseUp, mouse_event_.x, mouse_event_.y, 0);
+ blink::WebInputEvent::MouseUp, mouse_event_.x, mouse_event_.y, 0,
+ pointer_type_);
mouse_event_.clickCount = 1;
}

Powered by Google App Engine
This is Rietveld 408576698