| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
| Code-Review | +1 |
lgtm with nits
return base::WrapUnique<EventConverterEvdev>(nit: make_unique
struct input_event mock_kernel_queue[] = {can you disable clang format (add // clang-format off ... // clang-format on ) ?
struct input_event mock_kernel_queue[] = {ditto
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
| Commit-Queue | +2 |
return base::WrapUnique<EventConverterEvdev>(Vincent Chiangnit: make_unique
Done, and also changed the ones below.
struct input_event mock_kernel_queue[] = {can you disable clang format (add // clang-format off ... // clang-format on ) ?
Done
struct input_event mock_kernel_queue[] = {Vincent Chiangditto
Done
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
4 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:
```
The name of the file: ui/events/ozone/evdev/pen_tablet_event_converter_evdev_unittest.cc
Insertions: 34, Deletions: 15.
@@ -1638,29 +1638,39 @@
CreateDevice(WacomOneByWacomSPenCTC472);
struct input_event mock_kernel_queue[] = {
- {{0, 0}, EV_ABS, ABS_X, 8430}, {{0, 0}, EV_ABS, ABS_Y, 3571},
- {{0, 0}, EV_ABS, ABS_DISTANCE, 46}, {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
+ // clang-format off
+ {{0, 0}, EV_ABS, ABS_X, 8430},
+ {{0, 0}, EV_ABS, ABS_Y, 3571},
+ {{0, 0}, EV_ABS, ABS_DISTANCE, 46},
+ {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 0
{{0, 0}, EV_KEY, BTN_STYLUS2, 1}, // Event 1
- {{0, 0}, EV_ABS, ABS_X, 8464}, {{0, 0}, EV_ABS, ABS_Y, 3587},
+ {{0, 0}, EV_ABS, ABS_X, 8464},
+ {{0, 0}, EV_ABS, ABS_Y, 3587},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 2
{{0, 0}, EV_KEY, BTN_TOUCH, 1}, // Event 3
- {{0, 0}, EV_ABS, ABS_X, 8585}, {{0, 0}, EV_ABS, ABS_PRESSURE, 489},
+ {{0, 0}, EV_ABS, ABS_X, 8585},
+ {{0, 0}, EV_ABS, ABS_PRESSURE, 489},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 4
{{0, 0}, EV_KEY, BTN_TOUCH, 0}, // Event 5
- {{0, 0}, EV_ABS, ABS_X, 8167}, {{0, 0}, EV_ABS, ABS_PRESSURE, 0},
+ {{0, 0}, EV_ABS, ABS_X, 8167},
+ {{0, 0}, EV_ABS, ABS_PRESSURE, 0},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 6
{{0, 0}, EV_KEY, BTN_STYLUS2, 0}, // Event 7
- {{0, 0}, EV_ABS, ABS_X, 8029}, {{0, 0}, EV_ABS, ABS_Y, 4274},
+ {{0, 0}, EV_ABS, ABS_X, 8029},
+ {{0, 0}, EV_ABS, ABS_Y, 4274},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 8
- {{0, 0}, EV_ABS, ABS_X, 0}, {{0, 0}, EV_ABS, ABS_Y, 0},
- {{0, 0}, EV_ABS, ABS_DISTANCE, 0}, {{0, 0}, EV_KEY, BTN_TOOL_PEN, 0},
+ {{0, 0}, EV_ABS, ABS_X, 0},
+ {{0, 0}, EV_ABS, ABS_Y, 0},
+ {{0, 0}, EV_ABS, ABS_DISTANCE, 0},
+ {{0, 0}, EV_KEY, BTN_TOOL_PEN, 0},
{{0, 0}, EV_SYN, SYN_REPORT, 0},
+ // clang-format on
};
ExpectedEvent expected_events[] = {
@@ -1755,28 +1765,37 @@
CreateDevice(WacomOneByWacomSPenCTC472);
struct input_event mock_kernel_queue[] = {
- {{0, 0}, EV_ABS, ABS_X, 9886}, {{0, 0}, EV_ABS, ABS_Y, 5154},
- {{0, 0}, EV_ABS, ABS_DISTANCE, 46}, {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
+ // clang-format off
+ {{0, 0}, EV_ABS, ABS_X, 9886},
+ {{0, 0}, EV_ABS, ABS_Y, 5154},
+ {{0, 0}, EV_ABS, ABS_DISTANCE, 46},
+ {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 0
{{0, 0}, EV_KEY, BTN_TOUCH, 1}, // Event 1
- {{0, 0}, EV_ABS, ABS_X, 10015}, {{0, 0}, EV_ABS, ABS_PRESSURE, 300},
+ {{0, 0}, EV_ABS, ABS_X, 10015},
+ {{0, 0}, EV_ABS, ABS_PRESSURE, 300},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 2
{{0, 0}, EV_KEY, BTN_STYLUS2, 1}, // Event 3
{{0, 0}, EV_SYN, SYN_REPORT, 0},
{{0, 0}, EV_KEY, BTN_TOUCH, 0}, // Event 4
- {{0, 0}, EV_ABS, ABS_X, 9265}, {{0, 0}, EV_ABS, ABS_X, 5278},
+ {{0, 0}, EV_ABS, ABS_X, 9265},
+ {{0, 0}, EV_ABS, ABS_X, 5278},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 5
{{0, 0}, EV_KEY, BTN_STYLUS2, 0}, // Event 6
- {{0, 0}, EV_ABS, ABS_X, 9351}, {{0, 0}, EV_ABS, ABS_Y, 5029},
+ {{0, 0}, EV_ABS, ABS_X, 9351},
+ {{0, 0}, EV_ABS, ABS_Y, 5029},
{{0, 0}, EV_SYN, SYN_REPORT, 0}, // Event 7
- {{0, 0}, EV_ABS, ABS_X, 0}, {{0, 0}, EV_ABS, ABS_Y, 0},
- {{0, 0}, EV_ABS, ABS_DISTANCE, 0}, {{0, 0}, EV_KEY, BTN_TOOL_PEN, 0},
+ {{0, 0}, EV_ABS, ABS_X, 0},
+ {{0, 0}, EV_ABS, ABS_Y, 0},
+ {{0, 0}, EV_ABS, ABS_DISTANCE, 0},
+ {{0, 0}, EV_KEY, BTN_TOOL_PEN, 0},
{{0, 0}, EV_SYN, SYN_REPORT, 0},
+ // clang-format on
};
ExpectedEvent expected_events[] = {
```
```
The name of the file: ui/events/ozone/evdev/input_device_opener_evdev.cc
Insertions: 14, Deletions: 15.
@@ -6,6 +6,8 @@
#include <fcntl.h>
+#include <memory>
+
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/scoped_file.h"
@@ -72,35 +74,32 @@
// Graphics tablet
if (devinfo.HasTablet()) {
- return base::WrapUnique<EventConverterEvdev>(
- new PenTabletEventConverterEvdev(std::move(fd), params.path, params.id,
- params.cursor, devinfo,
- params.dispatcher));
+ return std::make_unique<PenTabletEventConverterEvdev>(
+ std::move(fd), params.path, params.id, params.cursor, devinfo,
+ params.dispatcher);
}
if (devinfo.HasGamepad()) {
- return base::WrapUnique<EventConverterEvdev>(new GamepadEventConverterEvdev(
- std::move(fd), params.path, params.id, devinfo, params.dispatcher));
+ return std::make_unique<GamepadEventConverterEvdev>(
+ std::move(fd), params.path, params.id, devinfo, params.dispatcher);
}
if (devinfo.IsStylusButtonDevice()) {
- return base::WrapUnique<EventConverterEvdev>(
- new StylusButtonEventConverterEvdev(
- std::move(fd), params.path, params.id, devinfo, params.dispatcher));
+ return std::make_unique<StylusButtonEventConverterEvdev>(
+ std::move(fd), params.path, params.id, devinfo, params.dispatcher);
}
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableMicrophoneMuteSwitchDeviceSwitch) &&
devinfo.IsMicrophoneMuteSwitchDevice()) {
- return base::WrapUnique<EventConverterEvdev>(
- new MicrophoneMuteSwitchEventConverterEvdev(
- std::move(fd), params.path, params.id, devinfo, params.dispatcher));
+ return std::make_unique<MicrophoneMuteSwitchEventConverterEvdev>(
+ std::move(fd), params.path, params.id, devinfo, params.dispatcher);
}
// Everything else: use EventConverterEvdevImpl.
- return base::WrapUnique<EventConverterEvdevImpl>(
- new EventConverterEvdevImpl(std::move(fd), params.path, params.id,
- devinfo, params.cursor, params.dispatcher));
+ return std::make_unique<EventConverterEvdevImpl>(
+ std::move(fd), params.path, params.id, devinfo, params.cursor,
+ params.dispatcher);
}
} // namespace
```
Rename TabletEventConverterEvdev to PenTabletEventConverterEvdev
This rename is to avoid the confusion of what a `tablet` is and
explicitly name the devices as `Pen Tablet`.
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |