Merge "Fix double-close in EventConverterEvdevImpl"

ui/events/ozone/evdev/touch_event_converter_evdev.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <bitset>
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/event_constants.h"
 #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 {
 
 class DeviceEventDispatcherEvdev;
 class TouchNoiseFinder;
 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,
                            DeviceEventDispatcherEvdev* dispatcher);
   ~TouchEventConverterEvdev() override;
 
   // EventConverterEvdev:
   bool HasTouchscreen() const override;
   bool HasPen() const override;
   gfx::Size GetTouchscreenSize() const override;
@@ skipping 38 matching lines @@
 
   void UpdateTrackingId(int slot, int tracking_id);
   void ReleaseTouches();
   void ReleaseButtons();
   void CancelAllTouches();
   // Normalize pressure value to [0, 1].
   float ScalePressure(int32_t value);
 
   int NextTrackingId();
 
+  // Input device file descriptor.
+  ScopedInputDevice input_device_fd_;
+
   // Dispatcher for events.
   DeviceEventDispatcherEvdev* dispatcher_;
 
   // Set if we drop events in kernel (SYN_DROPPED) or in process.
   bool dropped_events_ = false;
 
   // Device has multitouch capability.
   bool has_mt_ = false;
 
   // Device supports pen input.
@@ skipping 40 matching lines @@
 
   // Callback to enable/disable palm suppression.
   base::Callback<void(bool)> enable_palm_suppression_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_