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

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

Issue 2639043002: Fix double-close in EventConverterEvdevImpl (Closed)
Patch Set: remove base::debug::Alias 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.h
diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.h b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
index b8c528d40740c024ddc553187709ea6c6a817e2a..11e9e34bf3a0f7fd5769ebf11283e998a67c7345 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
@@ -14,6 +14,7 @@
#include "ui/events/ozone/evdev/event_device_info.h"
#include "ui/events/ozone/evdev/event_modifiers_evdev.h"
#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+#include "ui/events/ozone/evdev/scoped_input_device.h"
struct input_event;
@@ -24,7 +25,7 @@ class DeviceEventDispatcherEvdev;
class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
: public EventConverterEvdev {
public:
- TabletEventConverterEvdev(int fd,
+ TabletEventConverterEvdev(ScopedInputDevice fd,
base::FilePath path,
int id,
CursorDelegateEvdev* cursor,
@@ -48,6 +49,9 @@ class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
// non-axis-aligned movement properly.
void FlushEvents(const input_event& input);
+ // Input device file descriptor.
+ ScopedInputDevice input_device_fd_;
+
// Controller for watching the input fd.
base::MessagePumpLibevent::FileDescriptorWatcher controller_;

Powered by Google App Engine
This is Rietveld 408576698