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

Unified Diff: ui/events/ozone/evdev/touch_event_converter.cc

Issue 28513004: Move evdev events support into EventFactoryDelegateEvdev (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add evdev to filename_rules.gypi Created 7 years, 2 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
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter.h ('k') | ui/events/ozone/evdev/touch_event_converter_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/touch_event_converter.cc
diff --git a/ui/events/ozone/evdev/touch_event_converter_ozone.cc b/ui/events/ozone/evdev/touch_event_converter.cc
similarity index 94%
rename from ui/events/ozone/evdev/touch_event_converter_ozone.cc
rename to ui/events/ozone/evdev/touch_event_converter.cc
index 30e94139084a4bbf04c469c6c0393710111acac5..69e35e2a91fb3059322ee7576efe8b56bfac35df 100644
--- a/ui/events/ozone/evdev/touch_event_converter_ozone.cc
+++ b/ui/events/ozone/evdev/touch_event_converter.cc
@@ -2,7 +2,7 @@
// 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_ozone.h"
+#include "ui/events/ozone/evdev/touch_event_converter.h"
#include <fcntl.h>
#include <linux/input.h>
@@ -32,7 +32,7 @@ const float kFingerWidth = 25.f;
namespace ui {
-TouchEventConverterOzone::TouchEventConverterOzone(int fd, int id)
+TouchEventConverterEvdev::TouchEventConverterEvdev(int fd, int id)
: pressure_min_(0),
pressure_max_(0),
x_scale_(1.),
@@ -45,12 +45,12 @@ TouchEventConverterOzone::TouchEventConverterOzone(int fd, int id)
Init();
}
-TouchEventConverterOzone::~TouchEventConverterOzone() {
+TouchEventConverterEvdev::~TouchEventConverterEvdev() {
if (close(fd_) < 0)
DLOG(WARNING) << "failed close on /dev/input/event" << id_;
}
-void TouchEventConverterOzone::Init() {
+void TouchEventConverterEvdev::Init() {
input_absinfo abs = {};
if (ioctl(fd_, EVIOCGABS(ABS_MT_SLOT), &abs) != -1) {
CHECK_GE(abs.maximum, abs.minimum);
@@ -97,12 +97,12 @@ void TouchEventConverterOzone::Init() {
}
}
-void TouchEventConverterOzone::OnFileCanWriteWithoutBlocking(int /* fd */) {
+void TouchEventConverterEvdev::OnFileCanWriteWithoutBlocking(int /* fd */) {
// Read-only file-descriptors.
NOTREACHED();
}
-void TouchEventConverterOzone::OnFileCanReadWithoutBlocking(int fd) {
+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)
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter.h ('k') | ui/events/ozone/evdev/touch_event_converter_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698