evdev: Factor common code out of key & touch converters

ui/events/ozone/evdev/touch_event_converter.cc

 // Copyright 2013 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/touch_event_converter.h"
 
 #include <fcntl.h>
 #include <linux/input.h>
 #include <poll.h>
 #include <stdio.h>
@@ skipping 14 matching lines @@
 namespace {
 
 // Number is determined empirically.
 // TODO(rjkroege): Configure this per device.
 const float kFingerWidth = 25.f;
 
 }  // namespace
 
 namespace ui {
 
-TouchEventConverterEvdev::TouchEventConverterEvdev(int fd, base::FilePath path)
-    : pressure_min_(0),
+TouchEventConverterEvdev::TouchEventConverterEvdev(
+    int fd,
+    base::FilePath path,
+    EventModifiersEvdev* modifiers)
+    : EventConverterEvdev(fd, path, modifiers),
+      pressure_min_(0),
       pressure_max_(0),
       x_scale_(1.),
       y_scale_(1.),
       x_max_(std::numeric_limits<int>::max()),
       y_max_(std::numeric_limits<int>::max()),
-      current_slot_(0),
-      fd_(fd),
-      path_(path) {
+      current_slot_(0) {
   Init();
 }
 
 TouchEventConverterEvdev::~TouchEventConverterEvdev() {
-  if (fd_ >= 0 && close(fd_) < 0)
-    DLOG(WARNING) << "failed close on " << path_.value();
 }
 
 void TouchEventConverterEvdev::Init() {
   input_absinfo abs = {};
   if (ioctl(fd_, EVIOCGABS(ABS_MT_SLOT), &abs) != -1) {
     CHECK_GE(abs.maximum, abs.minimum);
     CHECK_GE(abs.minimum, 0);
   } else {
     DLOG(WARNING) << "failed ioctl EVIOCGABS ABS_MT_SLOT event on "
                   << path_.value();
@@ skipping 31 matching lines @@
       y_max_ = screen_height - 1;
       VLOG(1) << "touch input x_scale=" << x_scale_
               << " y_scale=" << y_scale_;
     } else {
       LOG(WARNING) << "malformed display spec from "
                    << "SurfaceFactoryOzone::DefaultDisplaySpec";
     }
   }
 }
 
-void TouchEventConverterEvdev::OnFileCanWriteWithoutBlocking(int /* fd */) {
-  // Read-only file-descriptors.
-  NOTREACHED();
-}
-
-void TouchEventConverterEvdev::OnFileCanReadWithoutBlocking(int fd) {
-  input_event inputs[MAX_FINGERS * 6 + 1];
-  ssize_t read_size = read(fd, inputs, sizeof(inputs));
-  if (read_size <= 0)
-    return;
-
-  for (unsigned i = 0; i < read_size / sizeof(*inputs); i++) {
+void TouchEventConverterEvdev::ProcessEvents(const struct input_event* inputs,
+                                             int count) {
+  for (int i = 0; i < count; i++) {
     const input_event& input = inputs[i];
     if (input.type == EV_ABS) {
       switch (input.code) {
         case ABS_MT_TOUCH_MAJOR:
           altered_slots_.set(current_slot_);
           events_[current_slot_].major_ = input.value;
           break;
         case ABS_X:
         case ABS_MT_POSITION_X:
           altered_slots_.set(current_slot_);
@@ skipping 66 matching lines @@
         default:
           NOTREACHED() << "invalid code for EV_KEY: " << input.code;
       }
     } else {
       NOTREACHED() << "invalid type: " << input.type;
     }
   }
 }
 
 }  // namespace ui