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

Unified Diff: ui/events/ozone/evdev/touch_event_converter_evdev.cc

Issue 512553002: ozone: evdev: Use tracking id for TouchEvent finger id (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add/fix tests Created 6 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 | « no previous file | ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/touch_event_converter_evdev.cc
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.cc b/ui/events/ozone/evdev/touch_event_converter_evdev.cc
index 2a5b37f5bc57e7e48805ac13538a96d2e3bc1c55..c24c50a5c93291789a60bea3395d463ab5c2c692 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.cc
@@ -280,16 +280,15 @@ void TouchEventConverterEvdev::ReportEvents(base::TimeDelta delta) {
for (int i = 0; i < MAX_FINGERS; i++) {
if (altered_slots_[i]) {
// TODO(rikroege): Support elliptical finger regions.
- TouchEvent evt(
- events_[i].type_,
- gfx::PointF(events_[i].x_, events_[i].y_),
- /* flags */ 0,
- /* touch_id */ i,
- delta,
- events_[i].pressure_ * kFingerWidth,
- events_[i].pressure_ * kFingerWidth,
- /* angle */ 0.,
- events_[i].pressure_);
+ TouchEvent evt(events_[i].type_,
+ gfx::PointF(events_[i].x_, events_[i].y_),
+ /* flags */ 0,
+ /* touch_id */ events_[i].finger_,
+ delta,
+ events_[i].pressure_ * kFingerWidth,
+ events_[i].pressure_ * kFingerWidth,
+ /* angle */ 0.,
+ events_[i].pressure_);
DispatchEventToCallback(&evt);
// Subsequent events for this finger will be touch-move until it
« no previous file with comments | « no previous file | ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698