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

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

Issue 2633233002: Add the pointer type of pen to the synthetic WebMousEvent (Closed)
Patch Set: Make disallow copy private 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/input/synthetic_mouse_driver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
index d08f69069270a214356c1b253ec036c5f1c0e857..38ff88081c216fc6179b9e6941292ca63f755ae7 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
+++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
@@ -125,19 +125,34 @@ int WebEventModifiersToEventFlags(int modifiers) {
return flags;
}
+ui::EventPointerType WebMousePointerTypeToEventPointerType(
+ blink::WebPointerProperties::PointerType type) {
+ if (type == blink::WebPointerProperties::PointerType::Mouse)
+ return ui::EventPointerType::POINTER_TYPE_MOUSE;
+ if (type == blink::WebPointerProperties::PointerType::Pen)
+ return ui::EventPointerType::POINTER_TYPE_PEN;
+ NOTREACHED() << "Unexpected mouse event pointer type";
+ return ui::EventPointerType::POINTER_TYPE_UNKNOWN;
+}
+
} // namespace
void SyntheticGestureTargetAura::DispatchWebMouseEventToPlatform(
- const blink::WebMouseEvent& web_mouse,
- const ui::LatencyInfo& latency_info) {
- ui::EventType event_type = WebMouseEventTypeToEventType(web_mouse.type());
- int flags = WebEventModifiersToEventFlags(web_mouse.modifiers());
+ const blink::WebMouseEvent& web_mouse_event,
+ const ui::LatencyInfo& latency_info) {
+ ui::EventType event_type =
+ WebMouseEventTypeToEventType(web_mouse_event.type());
+ int flags = WebEventModifiersToEventFlags(web_mouse_event.modifiers());
ui::MouseEvent mouse_event(event_type, gfx::Point(), gfx::Point(),
ui::EventTimeForNow(), flags, flags);
- gfx::PointF location(web_mouse.x * device_scale_factor_,
- web_mouse.y * device_scale_factor_);
+ gfx::PointF location(web_mouse_event.x * device_scale_factor_,
+ web_mouse_event.y * device_scale_factor_);
mouse_event.set_location_f(location);
mouse_event.set_root_location_f(location);
+ ui::PointerDetails pointer_details = mouse_event.pointer_details();
+ pointer_details.pointer_type =
+ WebMousePointerTypeToEventPointerType(web_mouse_event.pointerType);
+ mouse_event.set_pointer_details(pointer_details);
aura::Window* window = GetWindow();
mouse_event.ConvertLocationToTarget(window, window->GetRootWindow());
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/input/synthetic_mouse_driver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698