| Index: ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| index 24b01fcf0ac0fcf20f994e84e9ab1f34d9600514..3c265e0ec22ed2956309272bb9d90d711533dd0f 100644
|
| --- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| +++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| @@ -21,7 +21,13 @@ TabletEventConverterEvdev::TabletEventConverterEvdev(
|
| CursorDelegateEvdev* cursor,
|
| const EventDeviceInfo& info,
|
| DeviceEventDispatcherEvdev* dispatcher)
|
| - : EventConverterEvdev(fd, path, id, type),
|
| + : EventConverterEvdev(fd,
|
| + path,
|
| + id,
|
| + type,
|
| + info.name(),
|
| + info.vendor_id(),
|
| + info.product_id()),
|
| cursor_(cursor),
|
| dispatcher_(dispatcher),
|
| stylus_(0),
|
| @@ -145,8 +151,8 @@ void TabletEventConverterEvdev::DispatchMouseButton(const input_event& input) {
|
| bool down = input.value;
|
|
|
| dispatcher_->DispatchMouseButtonEvent(MouseButtonEventParams(
|
| - id_, cursor_->GetLocation(), button, down, false /* allow_remap */,
|
| - TimeDeltaFromInputEvent(input)));
|
| + input_device_.id, cursor_->GetLocation(), button, down,
|
| + false /* allow_remap */, TimeDeltaFromInputEvent(input)));
|
| }
|
|
|
| void TabletEventConverterEvdev::FlushEvents(const input_event& input) {
|
| @@ -164,8 +170,9 @@ void TabletEventConverterEvdev::FlushEvents(const input_event& input) {
|
|
|
| UpdateCursor();
|
|
|
| - dispatcher_->DispatchMouseMoveEvent(MouseMoveEventParams(
|
| - id_, cursor_->GetLocation(), TimeDeltaFromInputEvent(input)));
|
| + dispatcher_->DispatchMouseMoveEvent(
|
| + MouseMoveEventParams(input_device_.id, cursor_->GetLocation(),
|
| + TimeDeltaFromInputEvent(input)));
|
|
|
| abs_value_dirty_ = false;
|
| }
|
|
|