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

Unified Diff: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
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 ace5eb4cb62cd01b19ee5d816fb2709124cb0bf2..e799eeb8b063c51a6d2524ed9961386da282464b 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
@@ -145,7 +145,7 @@
MouseWheelEventQueueTest()
: acked_event_count_(0),
last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN) {
- queue_.reset(new MouseWheelEventQueue(this, kScrollEndTimeoutMs));
+ SetUpForGestureTesting(false);
}
~MouseWheelEventQueueTest() override {}
@@ -176,6 +176,11 @@
}
protected:
+ void SetUpForGestureTesting(bool send_gestures) {
+ queue_.reset(
+ new MouseWheelEventQueue(this, send_gestures, kScrollEndTimeoutMs));
+ }
+
size_t queued_event_count() const { return queue_->queued_size(); }
bool event_in_flight() const { return queue_->event_in_flight(); }
@@ -430,23 +435,28 @@
}
TEST_F(MouseWheelEventQueueTest, GestureSending) {
+ SetUpForGestureTesting(true);
GestureSendingTest(false);
}
TEST_F(MouseWheelEventQueueTest, GestureSendingPrecisePixels) {
+ SetUpForGestureTesting(true);
GestureSendingTest(false);
}
TEST_F(MouseWheelEventQueueTest, GestureSendingWithPhaseInformation) {
+ SetUpForGestureTesting(true);
PhaseGestureSendingTest(false);
}
TEST_F(MouseWheelEventQueueTest,
GestureSendingWithPhaseInformationPrecisePixels) {
+ SetUpForGestureTesting(true);
PhaseGestureSendingTest(true);
}
TEST_F(MouseWheelEventQueueTest, GestureSendingInterrupted) {
+ SetUpForGestureTesting(true);
const WebGestureEvent::ScrollUnits scroll_units = WebGestureEvent::Pixels;
SendMouseWheel(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
@@ -509,6 +519,7 @@
}
TEST_F(MouseWheelEventQueueTest, GestureRailScrolling) {
+ SetUpForGestureTesting(true);
const WebGestureEvent::ScrollUnits scroll_units = WebGestureEvent::Pixels;
SendMouseWheel(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,

Powered by Google App Engine
This is Rietveld 408576698