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

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

Issue 2270143002: ui/events: Add changed_button_flags_ in ui::PointerEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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/mojo/event.mojom ('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 2b6ceebeafc30b1d24efd5b93b63de52485a4b59..7c39621434cec967eb838632ec5a40db05090f39 100644
--- a/ui/events/mojo/event_struct_traits.cc
+++ b/ui/events/mojo/event_struct_traits.cc
@@ -167,6 +167,7 @@ StructTraits<ui::mojom::EventDataView, EventUniquePtr>::pointer_data(
if (event->IsPointerEvent()) {
const ui::PointerEvent* pointer_event = event->AsPointerEvent();
pointer_data->pointer_id = pointer_event->pointer_id();
+ pointer_data->changed_button_flags = pointer_event->changed_button_flags();
pointer_details = &pointer_event->pointer_details();
} else {
const ui::MouseWheelEvent* wheel_event = event->AsMouseWheelEvent();
@@ -287,6 +288,7 @@ bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read(
out->reset(new ui::PointerEvent(
MojoPointerEventTypeToUIEvent(event.action()), location,
screen_location, event.flags(), ui::PointerEvent::kMousePointerId,
+ pointer_data->changed_button_flags,
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
ui::EventTimeForNow()));
return true;
@@ -295,6 +297,7 @@ bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read(
out->reset(new ui::PointerEvent(
MojoPointerEventTypeToUIEvent(event.action()), location,
screen_location, event.flags(), pointer_data->pointer_id,
+ pointer_data->changed_button_flags,
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
pointer_data->brush_data->width,
pointer_data->brush_data->height,
« no previous file with comments | « ui/events/mojo/event.mojom ('k') | ui/events/mojo/struct_traits_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698