OLD | NEW |
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 "content/browser/renderer_host/input/gesture_event_queue.h" | 5 #include "content/browser/renderer_host/input/gesture_event_queue.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
17 #include "base/single_thread_task_runner.h" | 17 #include "base/single_thread_task_runner.h" |
18 #include "base/test/scoped_feature_list.h" | 18 #include "base/test/scoped_feature_list.h" |
| 19 #include "base/test/scoped_task_environment.h" |
19 #include "base/threading/thread_task_runner_handle.h" | 20 #include "base/threading/thread_task_runner_handle.h" |
20 #include "base/time/time.h" | 21 #include "base/time/time.h" |
21 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle
r.h" | 22 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle
r.h" |
22 #include "content/common/input/input_event_ack_state.h" | 23 #include "content/common/input/input_event_ack_state.h" |
23 #include "content/common/input/synthetic_web_input_event_builders.h" | 24 #include "content/common/input/synthetic_web_input_event_builders.h" |
24 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
25 #include "third_party/WebKit/public/platform/WebInputEvent.h" | 26 #include "third_party/WebKit/public/platform/WebInputEvent.h" |
26 #include "ui/events/blink/blink_features.h" | 27 #include "ui/events/blink/blink_features.h" |
27 | 28 |
28 using base::TimeDelta; | 29 using base::TimeDelta; |
29 using blink::WebGestureDevice; | 30 using blink::WebGestureDevice; |
30 using blink::WebGestureEvent; | 31 using blink::WebGestureEvent; |
31 using blink::WebInputEvent; | 32 using blink::WebInputEvent; |
32 | 33 |
33 namespace content { | 34 namespace content { |
34 | 35 |
35 class GestureEventQueueTest : public testing::Test, | 36 class GestureEventQueueTest : public testing::Test, |
36 public GestureEventQueueClient, | 37 public GestureEventQueueClient, |
37 public TouchpadTapSuppressionControllerClient { | 38 public TouchpadTapSuppressionControllerClient { |
38 public: | 39 public: |
39 GestureEventQueueTest() : GestureEventQueueTest(false) {} | 40 GestureEventQueueTest() : GestureEventQueueTest(false) {} |
40 | 41 |
41 GestureEventQueueTest(bool enable_compositor_event_queue) | 42 GestureEventQueueTest(bool enable_compositor_event_queue) |
42 : acked_gesture_event_count_(0), sent_gesture_event_count_(0) { | 43 : scoped_task_environment_( |
| 44 base::test::ScopedTaskEnvironment::MainThreadType::UI), |
| 45 acked_gesture_event_count_(0), |
| 46 sent_gesture_event_count_(0) { |
43 if (enable_compositor_event_queue) | 47 if (enable_compositor_event_queue) |
44 feature_list_.InitAndEnableFeature(features::kVsyncAlignedInputEvents); | 48 feature_list_.InitAndEnableFeature(features::kVsyncAlignedInputEvents); |
45 else | 49 else |
46 feature_list_.InitAndDisableFeature(features::kVsyncAlignedInputEvents); | 50 feature_list_.InitAndDisableFeature(features::kVsyncAlignedInputEvents); |
47 } | 51 } |
48 | 52 |
49 ~GestureEventQueueTest() override {} | 53 ~GestureEventQueueTest() override {} |
50 | 54 |
51 // testing::Test | 55 // testing::Test |
52 void SetUp() override { | 56 void SetUp() override { |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 | 192 |
189 bool WillIgnoreNextACK() { | 193 bool WillIgnoreNextACK() { |
190 return queue()->ignore_next_ack_; | 194 return queue()->ignore_next_ack_; |
191 } | 195 } |
192 | 196 |
193 GestureEventQueue* queue() const { | 197 GestureEventQueue* queue() const { |
194 return queue_.get(); | 198 return queue_.get(); |
195 } | 199 } |
196 | 200 |
197 private: | 201 private: |
| 202 base::test::ScopedTaskEnvironment scoped_task_environment_; |
198 std::unique_ptr<GestureEventQueue> queue_; | 203 std::unique_ptr<GestureEventQueue> queue_; |
199 size_t acked_gesture_event_count_; | 204 size_t acked_gesture_event_count_; |
200 size_t sent_gesture_event_count_; | 205 size_t sent_gesture_event_count_; |
201 WebGestureEvent last_acked_event_; | 206 WebGestureEvent last_acked_event_; |
202 std::unique_ptr<InputEventAckState> sync_ack_result_; | 207 std::unique_ptr<InputEventAckState> sync_ack_result_; |
203 std::unique_ptr<WebGestureEvent> sync_followup_event_; | 208 std::unique_ptr<WebGestureEvent> sync_followup_event_; |
204 base::MessageLoopForUI message_loop_; | |
205 base::test::ScopedFeatureList feature_list_; | 209 base::test::ScopedFeatureList feature_list_; |
206 }; | 210 }; |
207 | 211 |
208 #if GTEST_HAS_PARAM_TEST | 212 #if GTEST_HAS_PARAM_TEST |
209 // This is for tests that are to be run for all source devices. | 213 // This is for tests that are to be run for all source devices. |
210 class GestureEventQueueWithSourceTest | 214 class GestureEventQueueWithSourceTest |
211 : public GestureEventQueueTest, | 215 : public GestureEventQueueTest, |
212 public testing::WithParamInterface<WebGestureDevice> {}; | 216 public testing::WithParamInterface<WebGestureDevice> {}; |
213 #endif // GTEST_HAS_PARAM_TEST | 217 #endif // GTEST_HAS_PARAM_TEST |
214 | 218 |
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 SendInputEventACK(WebInputEvent::kGesturePinchUpdate, | 1238 SendInputEventACK(WebInputEvent::kGesturePinchUpdate, |
1235 INPUT_EVENT_ACK_STATE_CONSUMED); | 1239 INPUT_EVENT_ACK_STATE_CONSUMED); |
1236 SendInputEventACK(WebInputEvent::kGesturePinchUpdate, | 1240 SendInputEventACK(WebInputEvent::kGesturePinchUpdate, |
1237 INPUT_EVENT_ACK_STATE_CONSUMED); | 1241 INPUT_EVENT_ACK_STATE_CONSUMED); |
1238 EXPECT_EQ(WebInputEvent::kGesturePinchUpdate, last_acked_event().GetType()); | 1242 EXPECT_EQ(WebInputEvent::kGesturePinchUpdate, last_acked_event().GetType()); |
1239 EXPECT_EQ(0U, GestureEventQueueSize()); | 1243 EXPECT_EQ(0U, GestureEventQueueSize()); |
1240 EXPECT_EQ(0U, GetAndResetSentGestureEventCount()); | 1244 EXPECT_EQ(0U, GetAndResetSentGestureEventCount()); |
1241 } | 1245 } |
1242 | 1246 |
1243 } // namespace content | 1247 } // namespace content |
OLD | NEW |