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

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

Issue 1073573002: Ozone support for device special cases in keyboard event rewriting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review comments 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 95d0d77101ae69eb477db66ed934e98626dc8b18..d61f10e4832a469cb91051f08e47d264646592db 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.cc
@@ -83,8 +83,15 @@ TouchEventConverterEvdev::TouchEventConverterEvdev(
base::FilePath path,
int id,
InputDeviceType type,
+ const EventDeviceInfo& devinfo,
DeviceEventDispatcherEvdev* dispatcher)
- : EventConverterEvdev(fd, path, id, type),
+ : EventConverterEvdev(fd,
+ path,
+ id,
+ type,
+ devinfo.name(),
+ devinfo.vendor_id(),
+ devinfo.product_id()),
dispatcher_(dispatcher),
syn_dropped_(false),
has_mt_(false),
@@ -358,7 +365,7 @@ void TouchEventConverterEvdev::ReportEvent(const InProgressTouchEvdev& event,
EventType event_type,
const base::TimeDelta& timestamp) {
dispatcher_->DispatchTouchEvent(TouchEventParams(
- id_, event.slot, event_type, gfx::PointF(event.x, event.y),
+ input_device_.id, event.slot, event_type, gfx::PointF(event.x, event.y),
gfx::Vector2dF(event.radius_x, event.radius_y), event.pressure,
timestamp));
}

Powered by Google App Engine
This is Rietveld 408576698