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

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

Issue 2657533008: Merge "Fix double-close in EventConverterEvdevImpl" (Closed)
Patch Set: Created 3 years, 11 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 869520f2f276f934fff486ac65886103fbf7eeb3..ef021d392a213c277c59b0f8844e598aa4ab0f66 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
@@ -31,19 +31,20 @@ EventPointerType GetToolType(int button_tool) {
} // namespace
TabletEventConverterEvdev::TabletEventConverterEvdev(
- int fd,
+ ScopedInputDevice fd,
base::FilePath path,
int id,
CursorDelegateEvdev* cursor,
const EventDeviceInfo& info,
DeviceEventDispatcherEvdev* dispatcher)
- : EventConverterEvdev(fd,
+ : EventConverterEvdev(fd.get(),
path,
id,
info.device_type(),
info.name(),
info.vendor_id(),
info.product_id()),
+ input_device_fd_(std::move(fd)),
cursor_(cursor),
dispatcher_(dispatcher) {
x_abs_min_ = info.GetAbsMinimum(ABS_X);
« no previous file with comments | « ui/events/ozone/evdev/tablet_event_converter_evdev.h ('k') | ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698