Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc

Issue 561243002: ozone: evdev: Move read polling into EventConverterEvdev (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
index 86f8834d389a911af1d4d38c0798aa363b85dffa..eeb49f3aa03a47d8d59c493eae0cad3c11a964bb 100644
--- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
@@ -28,7 +28,7 @@ std::string FormatLog(const char* fmt, va_list args) {
EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
const base::FilePath& path,
scoped_ptr<Delegate> delegate)
- : path_(path), delegate_(delegate.Pass()) {
+ : EventConverterEvdev(fd, path), delegate_(delegate.Pass()) {
memset(&evdev_, 0, sizeof(evdev_));
evdev_.log = OnLogMessage;
evdev_.log_udata = this;
@@ -52,19 +52,6 @@ EventReaderLibevdevCros::~EventReaderLibevdevCros() {
EventReaderLibevdevCros::Delegate::~Delegate() {}
-void EventReaderLibevdevCros::Start() {
- base::MessageLoopForUI::current()->WatchFileDescriptor(
- evdev_.fd,
- true,
- base::MessagePumpLibevent::WATCH_READ,
- &controller_,
- this);
-}
-
-void EventReaderLibevdevCros::Stop() {
- controller_.StopWatchingFileDescriptor();
-}
-
void EventReaderLibevdevCros::OnFileCanReadWithoutBlocking(int fd) {
if (EvdevRead(&evdev_)) {
if (errno == EINTR || errno == EAGAIN)
@@ -76,10 +63,6 @@ void EventReaderLibevdevCros::OnFileCanReadWithoutBlocking(int fd) {
}
}
-void EventReaderLibevdevCros::OnFileCanWriteWithoutBlocking(int fd) {
- NOTREACHED();
-}
-
// static
void EventReaderLibevdevCros::OnSynReport(void* data,
EventStateRec* evstate,

Powered by Google App Engine
This is Rietveld 408576698