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

Unified Diff: ui/events/mojo/event_struct_traits.cc

Issue 2753163004: Remove ID from ui::PointerEvent's constructors (Closed)
Patch Set: Created 3 years, 9 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 | « ui/events/event_unittest.cc ('k') | ui/events/mojo/struct_traits_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/mojo/event_struct_traits.cc
diff --git a/ui/events/mojo/event_struct_traits.cc b/ui/events/mojo/event_struct_traits.cc
index d7c54b48ff82673da49f67ef8a776edb66d473ce..7c74f271fc8e1ece518ca38ea140f6834b153adc 100644
--- a/ui/events/mojo/event_struct_traits.cc
+++ b/ui/events/mojo/event_struct_traits.cc
@@ -282,7 +282,7 @@ bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read(
case ui::mojom::PointerKind::MOUSE: {
out->reset(new ui::PointerEvent(
MojoPointerEventTypeToUIEvent(event.action()), location,
- screen_location, event.flags(), ui::PointerEvent::kMousePointerId,
+ screen_location, event.flags(),
pointer_data->changed_button_flags,
event.action() == ui::mojom::EventType::POINTER_WHEEL_CHANGED
? ui::PointerDetails(
@@ -290,19 +290,20 @@ bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read(
gfx::Vector2d(
static_cast<int>(pointer_data->wheel_data->delta_x),
static_cast<int>(
- pointer_data->wheel_data->delta_y)))
- : ui::PointerDetails(
- ui::EventPointerType::POINTER_TYPE_MOUSE),
+ pointer_data->wheel_data->delta_y)),
+ ui::PointerEvent::kMousePointerId)
+ : ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId),
ui::EventTimeForNow()));
break;
}
case ui::mojom::PointerKind::TOUCH: {
out->reset(new ui::PointerEvent(
MojoPointerEventTypeToUIEvent(event.action()), location,
- screen_location, event.flags(), pointer_data->pointer_id,
+ screen_location, event.flags(),
pointer_data->changed_button_flags,
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
- /* pointer_id*/ 0,
+ /* pointer_id*/ pointer_data->pointer_id,
pointer_data->brush_data->width,
pointer_data->brush_data->height,
pointer_data->brush_data->pressure,
« no previous file with comments | « ui/events/event_unittest.cc ('k') | ui/events/mojo/struct_traits_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698