Wheel scroll latching enabled behind flag.

content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc

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..6e8421b2ad74d103b0996f3eab2e0ad1ebf4a859 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 kTouchpadScrollLating = true;

[tdresser, 2016/07/22 15:43:15]

Spelling.

[sahel, 2016/07/25 15:54:53]

Done.

+const int64_t kScrollEndTimeoutMs = kTouchpadScrollLating ? 100 : 0;
 
 base::TimeDelta DefaultScrollEndTimeoutDelay() {
   return base::TimeDelta::FromMilliseconds(kScrollEndTimeoutMs);
@@ -146,7 +147,7 @@ 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, kTouchpadScrollLating));
   }
 
   ~MouseWheelEventQueueTest() override {}
@@ -315,11 +316,10 @@ class MouseWheelEventQueueTest : public testing::Test,
                             WebMouseWheelEvent::PhaseNone);
     EXPECT_EQ(1U, GetAndResetSentEventCount());
     SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
-    EXPECT_EQ(3U, all_sent_events().size());
+    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_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
-    EXPECT_EQ(3U, GetAndResetSentEventCount());
+    EXPECT_EQ(2U, GetAndResetSentEventCount());
 
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
                             kWheelScrollGlobalY, 5, 5, 0, high_precision,
@@ -327,11 +327,9 @@ class MouseWheelEventQueueTest : public testing::Test,
                             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());
+    EXPECT_EQ(1U, all_sent_events().size());
+    EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(0));
+    EXPECT_EQ(1U, GetAndResetSentEventCount());
 
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
                             kWheelScrollGlobalY, 0, 0, 0, high_precision,
@@ -339,10 +337,9 @@ class MouseWheelEventQueueTest : public testing::Test,
                             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());
+    EXPECT_EQ(1U, all_sent_events().size());
+    EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(0));
+    EXPECT_EQ(1U, GetAndResetSentEventCount());
 
     // Send a double phase end; OSX does it consistently.
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
@@ -360,11 +357,10 @@ class MouseWheelEventQueueTest : public testing::Test,
                             WebMouseWheelEvent::PhaseBegan);
     EXPECT_EQ(1U, GetAndResetSentEventCount());
     SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
-    EXPECT_EQ(3U, all_sent_events().size());
+    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_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
-    EXPECT_EQ(3U, GetAndResetSentEventCount());
+    EXPECT_EQ(2U, GetAndResetSentEventCount());
 
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
                             kWheelScrollGlobalY, 5, 5, 0, high_precision,
@@ -372,11 +368,9 @@ class MouseWheelEventQueueTest : public testing::Test,
                             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());
+    EXPECT_EQ(1U, all_sent_events().size());
+    EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(0));
+    EXPECT_EQ(1U, GetAndResetSentEventCount());
 
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
                             kWheelScrollGlobalY, 0, 0, 0, high_precision,
@@ -384,10 +378,9 @@ class MouseWheelEventQueueTest : public testing::Test,
                             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());
+    EXPECT_EQ(1U, all_sent_events().size());
+    EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(0));
+    EXPECT_EQ(1U, GetAndResetSentEventCount());
   }
 
   std::unique_ptr<MouseWheelEventQueue> queue_;