Index: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
index 319563c4afd0d5f5ba951c9f437210c0bc381e97..b507320327148a53a0f91a87139bda3ea60de1e5 100644 |
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
@@ -30,7 +30,8 @@ const float kWheelScrollX = 10; |
const float kWheelScrollY = 12; |
const float kWheelScrollGlobalX = 50; |
const float kWheelScrollGlobalY = 72; |
-const int64_t kScrollEndTimeoutMs = 100; |
+const bool kTouchpadAndWheelScrollLatching = true; |
+const int64_t kScrollEndTimeoutMs = kTouchpadAndWheelScrollLatching ? 100 : 0; |
base::TimeDelta DefaultScrollEndTimeoutDelay() { |
return base::TimeDelta::FromMilliseconds(kScrollEndTimeoutMs); |
@@ -146,7 +147,8 @@ class MouseWheelEventQueueTest : public testing::Test, |
MouseWheelEventQueueTest() |
: acked_event_count_(0), |
last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN) { |
- queue_.reset(new MouseWheelEventQueue(this, kScrollEndTimeoutMs)); |
+ queue_.reset( |
+ new MouseWheelEventQueue(this, kTouchpadAndWheelScrollLatching)); |
dtapuska
2016/07/25 22:31:07
should this be a parameterized test? that it runs
tdresser
2016/07/26 12:19:00
+1! (https://github.com/google/googletest/blob/mas
sahel
2016/07/26 21:20:13
Done.
|
} |
~MouseWheelEventQueueTest() override {} |