ozone: evdev: Move read polling into EventConverterEvdev

ui/events/ozone/evdev/touch_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/touch_event_converter_evdev.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <poll.h>
@@ skipping 59 matching lines @@
 
 }  // namespace
 
 namespace ui {
 
 TouchEventConverterEvdev::TouchEventConverterEvdev(
     int fd,
     base::FilePath path,
     const EventDeviceInfo& info,
     const EventDispatchCallback& callback)
-    : EventConverterEvdev(callback),
+    : EventConverterEvdev(fd, path),
+      callback_(callback),
       syn_dropped_(false),
       is_type_a_(false),
-      current_slot_(0),
-      fd_(fd),
-      path_(path) {
+      current_slot_(0) {
   Init(info);
 }
 
 TouchEventConverterEvdev::~TouchEventConverterEvdev() {
   Stop();
   close(fd_);
 }
 
 void TouchEventConverterEvdev::Init(const EventDeviceInfo& info) {
   gfx::Screen *screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE);
@@ skipping 31 matching lines @@
   y_num_tuxels_ -= cal.bezel_top + cal.bezel_bottom;
 
   VLOG(1) << "applying touch calibration: "
           << base::StringPrintf("[%d, %d, %d, %d]",
                                 cal.bezel_left,
                                 cal.bezel_right,
                                 cal.bezel_top,
                                 cal.bezel_bottom);
 }
 
-void TouchEventConverterEvdev::Start() {
-  base::MessageLoopForUI::current()->WatchFileDescriptor(
-      fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this);
-}
-
-void TouchEventConverterEvdev::Stop() {
-  controller_.StopWatchingFileDescriptor();
-}
-
 bool TouchEventConverterEvdev::Reinitialize() {
   EventDeviceInfo info;
   if (info.Initialize(fd_)) {
     Init(info);
     return true;
   }
   return false;
 }
 
-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) {
     if (errno == EINTR || errno == EAGAIN)
       return;
     if (errno != ENODEV)
       PLOG(ERROR) << "error reading device " << path_.value();
     Stop();
     return;
@@ skipping 121 matching lines @@
       // TODO(rikroege): Support elliptical finger regions.
       TouchEvent evt(events_[i].type_,
                      gfx::PointF(events_[i].x_, events_[i].y_),
                      /* flags */ 0,
                      /* touch_id */ i,
                      delta,
                      /* radius_x */ events_[i].radius_x_,
                      /* radius_y */ events_[i].radius_y_,
                      /* angle */ 0.,
                      events_[i].pressure_);
-      DispatchEventToCallback(&evt);
+      callback_.Run(&evt);
 
       // Subsequent events for this finger will be touch-move until it
       // is released.
       events_[i].type_ = ET_TOUCH_MOVED;
     }
   }
   altered_slots_.reset();
 }
 
 }  // namespace ui