Index: ui/events/ozone/evdev/touch_event_converter_evdev.cc |
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.cc b/ui/events/ozone/evdev/touch_event_converter_evdev.cc |
index 525448a49c07ec7a27498ad47eb8dbf47a5fda32..bbdf660395eb164ba9d3bff5edfb7a6cc4797cb2 100644 |
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.cc |
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.cc |
@@ -77,12 +77,11 @@ TouchEventConverterEvdev::TouchEventConverterEvdev( |
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); |
} |
@@ -134,15 +133,6 @@ void TouchEventConverterEvdev::Init(const EventDeviceInfo& info) { |
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_)) { |
@@ -152,11 +142,6 @@ bool TouchEventConverterEvdev::Reinitialize() { |
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)); |
@@ -298,7 +283,7 @@ void TouchEventConverterEvdev::ReportEvents(base::TimeDelta delta) { |
/* 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. |