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

Side by Side Diff: ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc

Issue 991533002: Port Chromium OS touch noise filtering to Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <errno.h> 5 #include <errno.h>
6 #include <fcntl.h> 6 #include <fcntl.h>
7 #include <linux/input.h> 7 #include <linux/input.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
15 #include "base/posix/eintr_wrapper.h" 16 #include "base/posix/eintr_wrapper.h"
16 #include "base/run_loop.h" 17 #include "base/run_loop.h"
17 #include "base/time/time.h" 18 #include "base/time/time.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 #include "ui/events/devices/device_data_manager.h" 20 #include "ui/events/devices/device_data_manager.h"
21 #include "ui/events/event_switches.h"
20 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h" 22 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
23 #include "ui/events/ozone/evdev/touch_evdev_types.h"
21 #include "ui/events/ozone/evdev/touch_event_converter_evdev.h" 24 #include "ui/events/ozone/evdev/touch_event_converter_evdev.h"
25 #include "ui/events/ozone/evdev/touch_noise/touch_noise_filter.h"
26 #include "ui/events/ozone/evdev/touch_noise/touch_noise_finder.h"
22 #include "ui/events/platform/platform_event_dispatcher.h" 27 #include "ui/events/platform/platform_event_dispatcher.h"
23 #include "ui/events/platform/platform_event_source.h" 28 #include "ui/events/platform/platform_event_source.h"
24 29
30 namespace ui {
31
25 namespace { 32 namespace {
26 33
27 static int SetNonBlocking(int fd) { 34 static int SetNonBlocking(int fd) {
28 int flags = fcntl(fd, F_GETFL, 0); 35 int flags = fcntl(fd, F_GETFL, 0);
29 if (flags == -1) 36 if (flags == -1)
30 flags = 0; 37 flags = 0;
31 return fcntl(fd, F_SETFL, flags | O_NONBLOCK); 38 return fcntl(fd, F_SETFL, flags | O_NONBLOCK);
32 } 39 }
33 40
34 const char kTestDevicePath[] = "/dev/input/test-device"; 41 const char kTestDevicePath[] = "/dev/input/test-device";
35 42
36 } // namespace 43 } // namespace
37 44
38 namespace ui {
39
40 class MockTouchEventConverterEvdev : public TouchEventConverterEvdev { 45 class MockTouchEventConverterEvdev : public TouchEventConverterEvdev {
41 public: 46 public:
42 MockTouchEventConverterEvdev(int fd, 47 MockTouchEventConverterEvdev(int fd,
43 base::FilePath path, 48 base::FilePath path,
44 DeviceEventDispatcherEvdev* dispatcher); 49 DeviceEventDispatcherEvdev* dispatcher);
45 ~MockTouchEventConverterEvdev() override {} 50 ~MockTouchEventConverterEvdev() override {}
46 51
47 void ConfigureReadMock(struct input_event* queue, 52 void ConfigureReadMock(struct input_event* queue,
48 long read_this_many, 53 long read_this_many,
49 long queue_index); 54 long queue_index);
50 55
51 // Actually dispatch the event reader code. 56 // Actually dispatch the event reader code.
52 void ReadNow() { 57 void ReadNow() {
53 OnFileCanReadWithoutBlocking(read_pipe_); 58 OnFileCanReadWithoutBlocking(read_pipe_);
54 base::RunLoop().RunUntilIdle(); 59 base::RunLoop().RunUntilIdle();
55 } 60 }
56 61
57 void Initialize(const EventDeviceInfo& device_info) override {} 62 void Initialize(const EventDeviceInfo& device_info) override {}
58 bool Reinitialize() override { return true; } 63 bool Reinitialize() override { return true; }
59 64
65 TouchNoiseFinder* touch_noise_finder() { return touch_noise_finder_.get(); }
66
60 private: 67 private:
61 int read_pipe_; 68 int read_pipe_;
62 int write_pipe_; 69 int write_pipe_;
63 70
64 DISALLOW_COPY_AND_ASSIGN(MockTouchEventConverterEvdev); 71 DISALLOW_COPY_AND_ASSIGN(MockTouchEventConverterEvdev);
65 }; 72 };
66 73
67 class MockDeviceEventDispatcherEvdev : public DeviceEventDispatcherEvdev { 74 class MockDeviceEventDispatcherEvdev : public DeviceEventDispatcherEvdev {
68 public: 75 public:
69 MockDeviceEventDispatcherEvdev( 76 MockDeviceEventDispatcherEvdev(
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 120
114 if (pipe(fds)) 121 if (pipe(fds))
115 PLOG(FATAL) << "failed pipe"; 122 PLOG(FATAL) << "failed pipe";
116 123
117 EXPECT_FALSE(SetNonBlocking(fds[0]) || SetNonBlocking(fds[1])) 124 EXPECT_FALSE(SetNonBlocking(fds[0]) || SetNonBlocking(fds[1]))
118 << "failed to set non-blocking: " << strerror(errno); 125 << "failed to set non-blocking: " << strerror(errno);
119 126
120 read_pipe_ = fds[0]; 127 read_pipe_ = fds[0];
121 write_pipe_ = fds[1]; 128 write_pipe_ = fds[1];
122 129
123 events_.resize(MAX_FINGERS); 130 events_.resize(ui::kNumTouchEvdevSlots);
131 for (size_t i = 0; i < events_.size(); ++i)
132 events_[i].slot = i;
124 } 133 }
125 134
126 void MockTouchEventConverterEvdev::ConfigureReadMock(struct input_event* queue, 135 void MockTouchEventConverterEvdev::ConfigureReadMock(struct input_event* queue,
127 long read_this_many, 136 long read_this_many,
128 long queue_index) { 137 long queue_index) {
129 int nwrite = HANDLE_EINTR(write(write_pipe_, 138 int nwrite = HANDLE_EINTR(write(write_pipe_,
130 queue + queue_index, 139 queue + queue_index,
131 sizeof(struct input_event) * read_this_many)); 140 sizeof(struct input_event) * read_this_many));
132 DCHECK(nwrite == 141 DCHECK(nwrite ==
133 static_cast<int>(sizeof(struct input_event) * read_this_many)) 142 static_cast<int>(sizeof(struct input_event) * read_this_many))
134 << "write() failed, errno: " << errno; 143 << "write() failed, errno: " << errno;
135 } 144 }
136 145
137 } // namespace ui
138
139 // Test fixture. 146 // Test fixture.
140 class TouchEventConverterEvdevTest : public testing::Test { 147 class TouchEventConverterEvdevTest : public testing::Test {
141 public: 148 public:
142 TouchEventConverterEvdevTest() {} 149 TouchEventConverterEvdevTest() {}
143 150
144 // Overridden from testing::Test: 151 // Overridden from testing::Test:
145 void SetUp() override { 152 void SetUp() override {
146 // Set up pipe to satisfy message pump (unused). 153 // Set up pipe to satisfy message pump (unused).
147 int evdev_io[2]; 154 int evdev_io[2];
148 if (pipe(evdev_io)) 155 if (pipe(evdev_io))
(...skipping 20 matching lines...) Expand all
169 } 176 }
170 177
171 ui::MockTouchEventConverterEvdev* device() { return device_; } 178 ui::MockTouchEventConverterEvdev* device() { return device_; }
172 179
173 unsigned size() { return dispatched_events_.size(); } 180 unsigned size() { return dispatched_events_.size(); }
174 const ui::TouchEventParams& dispatched_event(unsigned index) { 181 const ui::TouchEventParams& dispatched_event(unsigned index) {
175 DCHECK_GT(dispatched_events_.size(), index); 182 DCHECK_GT(dispatched_events_.size(), index);
176 return dispatched_events_[index]; 183 return dispatched_events_[index];
177 } 184 }
178 185
186 void ClearDispatchedEvents() {
187 dispatched_events_.clear();
188 }
189
179 private: 190 private:
180 base::MessageLoop* loop_; 191 base::MessageLoop* loop_;
181 ui::MockTouchEventConverterEvdev* device_; 192 ui::MockTouchEventConverterEvdev* device_;
182 scoped_ptr<ui::MockDeviceEventDispatcherEvdev> dispatcher_; 193 scoped_ptr<ui::MockDeviceEventDispatcherEvdev> dispatcher_;
183 194
184 int events_out_; 195 int events_out_;
185 int events_in_; 196 int events_in_;
186 197
187 void DispatchCallback(const ui::TouchEventParams& params) { 198 void DispatchCallback(const ui::TouchEventParams& params) {
188 dispatched_events_.push_back(params); 199 dispatched_events_.push_back(params);
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 564
554 // crbug.com/446939 565 // crbug.com/446939
555 TEST_F(TouchEventConverterEvdevTest, CheckSlotLimit) { 566 TEST_F(TouchEventConverterEvdevTest, CheckSlotLimit) {
556 ui::MockTouchEventConverterEvdev* dev = device(); 567 ui::MockTouchEventConverterEvdev* dev = device();
557 568
558 struct input_event mock_kernel_queue[] = { 569 struct input_event mock_kernel_queue[] = {
559 {{0, 0}, EV_ABS, ABS_MT_SLOT, 0}, 570 {{0, 0}, EV_ABS, ABS_MT_SLOT, 0},
560 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 100}, 571 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 100},
561 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 999}, 572 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 999},
562 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 888}, 573 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 888},
563 {{0, 0}, EV_ABS, ABS_MT_SLOT, ui::TouchEventConverterEvdev::MAX_FINGERS}, 574 {{0, 0}, EV_ABS, ABS_MT_SLOT, ui::kNumTouchEvdevSlots},
564 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 200}, 575 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 200},
565 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 777}, 576 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 777},
566 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 666}, 577 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 666},
567 {{0, 0}, EV_SYN, SYN_REPORT, 0}, 578 {{0, 0}, EV_SYN, SYN_REPORT, 0},
568 }; 579 };
569 580
570 // Check that one 1 event is generated 581 // Check that one 1 event is generated
571 dev->ConfigureReadMock(mock_kernel_queue, arraysize(mock_kernel_queue), 0); 582 dev->ConfigureReadMock(mock_kernel_queue, arraysize(mock_kernel_queue), 0);
572 dev->ReadNow(); 583 dev->ReadNow();
573 EXPECT_EQ(1u, size()); 584 EXPECT_EQ(1u, size());
574 } 585 }
586
587 namespace {
588
589 // TouchNoiseFilter which:
590 // - Considers all events of type |noise_event_type| as noise.
591 // - Keeps track of the events that it receives.
592 class EventTypeTouchNoiseFilter : public TouchNoiseFilter {
593 public:
594 explicit EventTypeTouchNoiseFilter(EventType noise_event_type)
595 : noise_event_type_(noise_event_type) {}
596 ~EventTypeTouchNoiseFilter() override {}
597
598 // TouchNoiseFilter:
599 void Filter(const std::vector<InProgressTouchEvdev>& touches,
600 base::TimeDelta time,
601 std::bitset<kNumTouchEvdevSlots>* slots_with_noise) override {
602 for (const InProgressTouchEvdev& touch : touches) {
603 ++counts_[touch.type];
604 if (touch.type == noise_event_type_)
605 slots_with_noise->set(touch.slot);
606 }
607 }
608
609 // Returns the number of received events of |type|.
610 size_t num_events(EventType type) const {
611 std::map<EventType, size_t>::const_iterator it = counts_.find(type);
612 return it == counts_.end() ? 0u : it->second;
613 }
614
615 private:
616 EventType noise_event_type_;
617 std::map<EventType, size_t> counts_;
618
619 DISALLOW_COPY_AND_ASSIGN(EventTypeTouchNoiseFilter);
620 };
621
622 } // namespace
623
624 class TouchEventConverterEvdevTouchNoiseTest
625 : public TouchEventConverterEvdevTest {
626 public:
627 TouchEventConverterEvdevTouchNoiseTest() {}
628 ~TouchEventConverterEvdevTouchNoiseTest() override {}
629
630 // Makes the TouchNoiseFinder use |filter| and only |filter| to filter out
631 // touch noise.
632 void SetTouchNoiseFilter(scoped_ptr<TouchNoiseFilter> filter) {
633 TouchNoiseFinder* finder = device()->touch_noise_finder();
634 finder->filters_.clear();
635 finder->filters_.push_back(filter.release());
636 }
637
638 // Returns the first of TouchNoiseFinder's filters.
639 ui::TouchNoiseFilter* first_filter() {
640 TouchNoiseFinder* finder = device()->touch_noise_finder();
641 return finder->filters_.empty() ? nullptr : *finder->filters_.begin();
642 }
643
644 // TouchEventConverterEvdevTest:
645 void SetUp() override {
646 base::CommandLine::ForCurrentProcess()->AppendSwitch(
647 switches::kExtraTouchNoiseFiltering);
648 TouchEventConverterEvdevTest::SetUp();
649 }
650
651 private:
652 DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdevTouchNoiseTest);
653 };
654
655 // Test that if TouchNoiseFinder identifies an event for an in-progress touch as
656 // noise, that all subsequent events for that touch are converted to
657 // ET_TOUCH_CANCELED.
658 TEST_F(TouchEventConverterEvdevTouchNoiseTest, TouchNoiseFiltering) {
659 struct input_event mock_kernel_queue[] = {
660 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 684},
661 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 40},
662 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 41},
663 {{0, 0}, EV_SYN, SYN_REPORT, 0},
664
665 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 42},
666 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 43},
667 {{0, 0}, EV_SYN, SYN_REPORT, 0},
668
669 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, -1},
670 {{0, 0}, EV_SYN, SYN_REPORT, 0}
671 };
672
673 MockTouchEventConverterEvdev* dev = device();
674 SetTouchNoiseFilter(scoped_ptr<TouchNoiseFilter>(
675 new EventTypeTouchNoiseFilter(ET_TOUCH_PRESSED)));
676 dev->ConfigureReadMock(mock_kernel_queue, arraysize(mock_kernel_queue), 0);
677 dev->ReadNow();
678 ASSERT_EQ(0u, size());
679
680 ClearDispatchedEvents();
681 SetTouchNoiseFilter(scoped_ptr<TouchNoiseFilter>(
682 new EventTypeTouchNoiseFilter(ET_TOUCH_MOVED)));
683 dev->ConfigureReadMock(mock_kernel_queue, arraysize(mock_kernel_queue), 0);
684 dev->ReadNow();
685 ASSERT_EQ(2u, size());
686 TouchEventParams event0 = dispatched_event(0);
687 EXPECT_EQ(ET_TOUCH_PRESSED, event0.type);
688 EXPECT_EQ(40, event0.location.x());
689 EXPECT_EQ(41, event0.location.y());
690 EXPECT_EQ(ET_TOUCH_CANCELLED, dispatched_event(1).type);
691
692 ClearDispatchedEvents();
693 SetTouchNoiseFilter(scoped_ptr<TouchNoiseFilter>(
694 new EventTypeTouchNoiseFilter(ET_TOUCH_RELEASED)));
695 dev->ConfigureReadMock(mock_kernel_queue, arraysize(mock_kernel_queue), 0);
696 dev->ReadNow();
697 ASSERT_EQ(3u, size());
698 event0 = dispatched_event(0);
699 EXPECT_EQ(ET_TOUCH_PRESSED, event0.type);
700 EXPECT_EQ(40, event0.location.x());
701 EXPECT_EQ(41, event0.location.y());
702 TouchEventParams event1 = dispatched_event(1);
703 EXPECT_EQ(ET_TOUCH_MOVED, event1.type);
704 EXPECT_EQ(42, event1.location.x());
705 EXPECT_EQ(43, event1.location.y());
706 EXPECT_EQ(ET_TOUCH_CANCELLED, dispatched_event(2).type);
707 }
708
709 // Test that TouchEventConverterEvdev sends the non-canceled versions of events
710 // to TouchNoiseFInder (and no ET_TOUCH_CANCELED events).
711 TEST_F(TouchEventConverterEvdevTouchNoiseTest,
712 DoNotSendTouchCancelsToTouchNoiseFinder) {
713 struct input_event mock_kernel_queue[] = {
714 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 684},
715 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 40},
716 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 41},
717 {{0, 0}, EV_SYN, SYN_REPORT, 0},
718
719 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 42},
720 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 43},
721 {{0, 0}, EV_SYN, SYN_REPORT, 0},
722
723 {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 43},
724 {{0, 0}, EV_ABS, ABS_MT_POSITION_Y, 44},
725 {{0, 0}, EV_SYN, SYN_REPORT, 0},
726
727 {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, -1},
728 {{0, 0}, EV_SYN, SYN_REPORT, 0}
729 };
730
731 MockTouchEventConverterEvdev* dev = device();
732 SetTouchNoiseFilter(scoped_ptr<TouchNoiseFilter>(
733 new EventTypeTouchNoiseFilter(ET_TOUCH_PRESSED)));
734 dev->ConfigureReadMock(mock_kernel_queue, arraysize(mock_kernel_queue), 0);
735 dev->ReadNow();
736 ASSERT_EQ(0u, size());
737
738 EventTypeTouchNoiseFilter* filter =
739 static_cast<EventTypeTouchNoiseFilter*>(first_filter());
740 EXPECT_EQ(0u, filter->num_events(ET_TOUCH_CANCELLED));
741 EXPECT_EQ(1u, filter->num_events(ET_TOUCH_PRESSED));
742 EXPECT_EQ(2u, filter->num_events(ET_TOUCH_MOVED));
743 EXPECT_EQ(1u, filter->num_events(ET_TOUCH_RELEASED));
744 }
745
746 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698