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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2256733003: Touchpad scroll latching enabled for Mac behind flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ClearCurrentlyScrollingLayerForTesting added. Created 4 years, 4 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
« no previous file with comments | « content/browser/renderer_host/input/mouse_wheel_event_queue.cc ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fc6995e8fe35477e02163d8223199eae7c880015..e5cea2eb6956602af9f83a2b3b14e57dcc174298 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
@@ -318,11 +318,18 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
WebMouseWheelEvent::PhaseNone);
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(3U, all_sent_events().size());
- EXPECT_GESTURE_SCROLL_BEGIN_WITH_PHASE(sent_gesture_event(0));
- EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
- EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
- EXPECT_EQ(3U, GetAndResetSentEventCount());
+ if (scroll_latching_enabled_) {
+ EXPECT_EQ(2U, all_sent_events().size());
+ EXPECT_GESTURE_SCROLL_BEGIN_WITH_PHASE(sent_gesture_event(0));
+ EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
+ EXPECT_EQ(2U, GetAndResetSentEventCount());
+ } else {
+ EXPECT_EQ(3U, all_sent_events().size());
+ EXPECT_GESTURE_SCROLL_BEGIN_WITH_PHASE(sent_gesture_event(0));
+ EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
+ EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
+ EXPECT_EQ(3U, GetAndResetSentEventCount());
+ }
SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
kWheelScrollGlobalY, 5, 5, 0, high_precision,
@@ -330,22 +337,33 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
WebMouseWheelEvent::PhaseNone);
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(3U, all_sent_events().size());
- EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
- EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
- EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
- EXPECT_EQ(3U, GetAndResetSentEventCount());
-
+ if (scroll_latching_enabled_) {
+ EXPECT_EQ(1U, all_sent_events().size());
+ EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(0));
+ EXPECT_EQ(1U, GetAndResetSentEventCount());
+ } else {
+ EXPECT_EQ(3U, all_sent_events().size());
+ EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
+ EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
+ EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
+ EXPECT_EQ(3U, GetAndResetSentEventCount());
+ }
SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
kWheelScrollGlobalY, 0, 0, 0, high_precision,
WebMouseWheelEvent::PhaseEnded,
WebMouseWheelEvent::PhaseNone);
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
- EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(1));
- EXPECT_EQ(2U, GetAndResetSentEventCount());
+ if (scroll_latching_enabled_) {
+ EXPECT_EQ(1U, all_sent_events().size());
+ EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(0));
+ EXPECT_EQ(1U, GetAndResetSentEventCount());
+ } else {
+ EXPECT_EQ(2U, all_sent_events().size());
+ EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
+ EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(1));
+ EXPECT_EQ(2U, GetAndResetSentEventCount());
+ }
// Send a double phase end; OSX does it consistently.
SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
@@ -363,11 +381,18 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
WebMouseWheelEvent::PhaseBegan);
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(3U, all_sent_events().size());
- EXPECT_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
- EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
- EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
- EXPECT_EQ(3U, GetAndResetSentEventCount());
+ if (scroll_latching_enabled_) {
+ EXPECT_EQ(2U, all_sent_events().size());
+ EXPECT_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
+ EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
+ EXPECT_EQ(2U, GetAndResetSentEventCount());
+ } else {
+ EXPECT_EQ(3U, all_sent_events().size());
+ EXPECT_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
+ EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
+ EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
+ EXPECT_EQ(3U, GetAndResetSentEventCount());
+ }
SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
kWheelScrollGlobalY, 5, 5, 0, high_precision,
@@ -375,11 +400,17 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
WebMouseWheelEvent::PhaseChanged);
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(3U, all_sent_events().size());
- EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
- EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
- EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
- EXPECT_EQ(3U, GetAndResetSentEventCount());
+ if (scroll_latching_enabled_) {
+ EXPECT_EQ(1U, all_sent_events().size());
+ EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(0));
+ EXPECT_EQ(1U, GetAndResetSentEventCount());
+ } else {
+ EXPECT_EQ(3U, all_sent_events().size());
+ EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
+ EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
+ EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
+ EXPECT_EQ(3U, GetAndResetSentEventCount());
+ }
SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
kWheelScrollGlobalY, 0, 0, 0, high_precision,
@@ -387,10 +418,16 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
WebMouseWheelEvent::PhaseEnded);
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
- EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(1));
- EXPECT_EQ(2U, GetAndResetSentEventCount());
+ if (scroll_latching_enabled_) {
+ EXPECT_EQ(1U, all_sent_events().size());
+ EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(0));
+ EXPECT_EQ(1U, GetAndResetSentEventCount());
+ } else {
+ EXPECT_EQ(2U, all_sent_events().size());
+ EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
+ EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(1));
+ EXPECT_EQ(2U, GetAndResetSentEventCount());
+ }
}
std::unique_ptr<MouseWheelEventQueue> queue_;
« no previous file with comments | « content/browser/renderer_host/input/mouse_wheel_event_queue.cc ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698