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

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

Powered by Google App Engine
This is Rietveld 408576698