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

Unified Diff: ui/events/gestures/motion_event_aura.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 | « ui/events/event_unittest.cc ('k') | ui/events/ozone/events_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/motion_event_aura.cc
diff --git a/ui/events/gestures/motion_event_aura.cc b/ui/events/gestures/motion_event_aura.cc
index 8c345f893eeb87c12f8b3214cc7ed5fc154e7050..033006b92bb88cf48e3b9152e43693a6ddcd9b26 100644
--- a/ui/events/gestures/motion_event_aura.cc
+++ b/ui/events/gestures/motion_event_aura.cc
@@ -17,10 +17,11 @@ PointerProperties GetPointerPropertiesFromTouchEvent(const TouchEvent& touch) {
pointer_properties.raw_x = touch.root_location_f().x();
pointer_properties.raw_y = touch.root_location_f().y();
pointer_properties.id = touch.touch_id();
- pointer_properties.pressure = touch.force();
+ pointer_properties.pressure = touch.pointer_details().force();
pointer_properties.source_device_id = touch.source_device_id();
- pointer_properties.SetAxesAndOrientation(touch.radius_x(), touch.radius_y(),
+ pointer_properties.SetAxesAndOrientation(touch.pointer_details().radius_x(),
+ touch.pointer_details().radius_y(),
touch.rotation_angle());
if (!pointer_properties.touch_major) {
pointer_properties.touch_major =
« no previous file with comments | « ui/events/event_unittest.cc ('k') | ui/events/ozone/events_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698