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

Unified Diff: ui/events/ozone/evdev/event_converter_evdev_impl.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/event_converter_evdev_impl.h
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl.h b/ui/events/ozone/evdev/event_converter_evdev_impl.h
index 820554ec7efa190e24e22738f7ad368e14cf331b..228d63cda87dc5b5a57236590d851a10bba06c3c 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl.h
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl.h
@@ -19,6 +19,7 @@
#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
#include "ui/events/ozone/evdev/keyboard_evdev.h"
#include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
+#include "ui/events/ozone/evdev/scoped_input_device.h"
struct input_event;
@@ -29,7 +30,7 @@ class DeviceEventDispatcherEvdev;
class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdevImpl
: public EventConverterEvdev {
public:
- EventConverterEvdevImpl(int fd,
+ EventConverterEvdevImpl(ScopedInputDevice fd,
base::FilePath path,
int id,
const EventDeviceInfo& info,
@@ -64,6 +65,9 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdevImpl
// non-axis-aligned movement properly.
void FlushEvents(const input_event& input);
+ // Input device file descriptor.
+ ScopedInputDevice input_device_fd_;
+
// Input modalities for this device.
bool has_keyboard_;
bool has_touchpad_;

Powered by Google App Engine
This is Rietveld 408576698