Merge "Fix double-close in EventConverterEvdevImpl"

ui/events/ozone/evdev/tablet_event_converter_evdev.cc

 // 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.
 
 #include "ui/events/ozone/evdev/tablet_event_converter_evdev.h"
 
 #include <errno.h>
 #include <linux/input.h>
 #include <stddef.h>
 
@@ skipping 13 matching lines @@
 
 EventPointerType GetToolType(int button_tool) {
   if (button_tool == BTN_TOOL_RUBBER)
     return EventPointerType::POINTER_TYPE_ERASER;
   return EventPointerType::POINTER_TYPE_PEN;
 }
 
 }  // 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);
   x_abs_range_ = info.GetAbsMaximum(ABS_X) - x_abs_min_ + 1;
   y_abs_min_ = info.GetAbsMinimum(ABS_Y);
   y_abs_range_ = info.GetAbsMaximum(ABS_Y) - y_abs_min_ + 1;
   tilt_x_min_ = info.GetAbsMinimum(ABS_TILT_X);
   tilt_y_min_ = info.GetAbsMinimum(ABS_TILT_Y);
   tilt_x_range_ = info.GetAbsMaximum(ABS_TILT_X) - tilt_x_min_ + 1;
   tilt_y_range_ = info.GetAbsMaximum(ABS_TILT_Y) - tilt_y_min_ + 1;
@@ skipping 154 matching lines @@
       input_device_.id, EF_NONE, cursor_->GetLocation(),
       PointerDetails(GetToolType(stylus_),
                      /* radius_x */ 0.0f, /* radius_y */ 0.0f, pressure_,
                      tilt_x_, tilt_y_),
       TimeTicksFromInputEvent(input)));
 
   abs_value_dirty_ = false;
 }
 
 }  // namespace ui