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

Unified Diff: ui/events/ozone/evdev/touch_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/touch_event_converter_evdev.h
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.h b/ui/events/ozone/evdev/touch_event_converter_evdev.h
index 45ceb653bcd2a1580c1f2537127c420db5f5f6ba..26a557d4e3f9a0688553018713cd74d0ddd2c927 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.h
@@ -19,6 +19,7 @@
#include "ui/events/ozone/evdev/event_converter_evdev.h"
#include "ui/events/ozone/evdev/event_device_info.h"
#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+#include "ui/events/ozone/evdev/scoped_input_device.h"
#include "ui/events/ozone/evdev/touch_evdev_debug_buffer.h"
namespace ui {
@@ -30,7 +31,7 @@ struct InProgressTouchEvdev;
class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
: public EventConverterEvdev {
public:
- TouchEventConverterEvdev(int fd,
+ TouchEventConverterEvdev(ScopedInputDevice fd,
base::FilePath path,
int id,
const EventDeviceInfo& devinfo,
@@ -88,6 +89,9 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
int NextTrackingId();
+ // Input device file descriptor.
+ ScopedInputDevice input_device_fd_;
+
// Dispatcher for events.
DeviceEventDispatcherEvdev* dispatcher_;

Powered by Google App Engine
This is Rietveld 408576698