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

Unified Diff: mojo/converters/input_events/input_events_type_converters.cc

Issue 1300803003: Drop ui::TouchEvent shims for radius_{x,y} and force (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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 | « ash/touch/touch_uma.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/converters/input_events/input_events_type_converters.cc
diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc
index 88b35fe6a3b2cf739b1b464ddae39a43a091bf07..f1db97c009d425e639c812d3da0f2df2ee244af6 100644
--- a/mojo/converters/input_events/input_events_type_converters.cc
+++ b/mojo/converters/input_events/input_events_type_converters.cc
@@ -193,9 +193,9 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) {
pointer_data->pointer_id = touch_event->touch_id();
pointer_data->kind = POINTER_KIND_TOUCH;
SetPointerDataLocationFromEvent(*touch_event, pointer_data.get());
- pointer_data->radius_major = touch_event->radius_x();
- pointer_data->radius_minor = touch_event->radius_y();
- pointer_data->pressure = touch_event->force();
+ pointer_data->radius_major = touch_event->pointer_details().radius_x();
+ pointer_data->radius_minor = touch_event->pointer_details().radius_y();
+ pointer_data->pressure = touch_event->pointer_details().force();
pointer_data->orientation = touch_event->rotation_angle();
event->pointer_data = pointer_data.Pass();
} else if (input.IsKeyEvent()) {
« no previous file with comments | « ash/touch/touch_uma.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698