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

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

Issue 1097393011: Revert of Ozone support for device special cases in keyboard event rewriting. (patchset #6 id:12000… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
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 5b7b2596f97f7c2c3ecada4f7a84165dba014af3..ea95b12b94f4e23313d034242dfce54c47496a5a 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.cc
@@ -86,15 +86,8 @@ TouchEventConverterEvdev::TouchEventConverterEvdev(
base::FilePath path,
int id,
InputDeviceType type,
- const EventDeviceInfo& devinfo,
DeviceEventDispatcherEvdev* dispatcher)
- : EventConverterEvdev(fd,
- path,
- id,
- type,
- devinfo.name(),
- devinfo.vendor_id(),
- devinfo.product_id()),
+ : EventConverterEvdev(fd, path, id, type),
dispatcher_(dispatcher),
syn_dropped_(false),
has_mt_(false),
@@ -368,7 +361,7 @@ void TouchEventConverterEvdev::ReportEvent(const InProgressTouchEvdev& event,
EventType event_type,
const base::TimeDelta& timestamp) {
dispatcher_->DispatchTouchEvent(TouchEventParams(
- input_device_.id, event.slot, event_type, gfx::PointF(event.x, event.y),
+ id_, event.slot, event_type, gfx::PointF(event.x, event.y),
gfx::Vector2dF(event.radius_x, event.radius_y), event.pressure,
timestamp));
}
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter_evdev.h ('k') | 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