| 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)
|
|
|