Wheel scroll latching enabled behind flag.

content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 12 matching lines @@
 using blink::WebInputEvent;
 using blink::WebMouseWheelEvent;
 
 namespace content {
 namespace {
 
 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);
 }
 
 #define EXPECT_GESTURE_SCROLL_BEGIN_IMPL(event)              \
   EXPECT_EQ(WebInputEvent::GestureScrollBegin, event->type); \
   EXPECT_EQ(kWheelScrollX, event->x);                        \
   EXPECT_EQ(kWheelScrollY, event->y);                        \
   EXPECT_EQ(kWheelScrollGlobalX, event->globalX);            \
@@ skipping 95 matching lines @@
   EXPECT_EQ(WebInputEvent::MouseWheel, event->type);
 
 }  // namespace
 
 class MouseWheelEventQueueTest : public testing::Test,
                                  public MouseWheelEventQueueClient {
  public:
   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 {}
 
   // MouseWheelEventQueueClient
   void SendMouseWheelEventImmediately(
       const MouseWheelEventWithLatencyInfo& event) override {
     WebMouseWheelEvent* cloned_event = new WebMouseWheelEvent();
     std::unique_ptr<WebInputEvent> cloned_event_holder(cloned_event);
     *cloned_event = event.event;
@@ skipping 148 matching lines @@
     const WebGestureEvent::ScrollUnits scroll_units =
         high_precision ? WebGestureEvent::PrecisePixels
                        : WebGestureEvent::Pixels;
 
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
                             kWheelScrollGlobalY, 1, 1, 0, high_precision,
                             WebMouseWheelEvent::PhaseBegan,
                             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,
                             WebMouseWheelEvent::PhaseChanged,
                             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,
                             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());
+    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,
                             kWheelScrollGlobalY, 0, 0, 0, high_precision,
                             WebMouseWheelEvent::PhaseEnded,
                             WebMouseWheelEvent::PhaseNone);
     EXPECT_EQ(1U, GetAndResetSentEventCount());
     SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
     EXPECT_EQ(0U, all_sent_events().size());
     EXPECT_EQ(0U, GetAndResetSentEventCount());
 
     SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
                             kWheelScrollGlobalY, 5, 5, 0, high_precision,
                             WebMouseWheelEvent::PhaseNone,
                             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,
                             WebMouseWheelEvent::PhaseNone,
                             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,
                             WebMouseWheelEvent::PhaseNone,
                             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_;
   std::vector<std::unique_ptr<WebInputEvent>> sent_events_;
   size_t acked_event_count_;
   InputEventAckState last_acked_event_state_;
   base::MessageLoopForUI message_loop_;
   WebMouseWheelEvent last_acked_event_;
 };
 
@@ skipping 151 matching lines @@
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
   EXPECT_EQ(2U, all_sent_events().size());
   EXPECT_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
   EXPECT_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
   EXPECT_EQ(0U, sent_gesture_event(1)->data.scrollUpdate.deltaX);
   EXPECT_EQ(1U, sent_gesture_event(1)->data.scrollUpdate.deltaY);
   EXPECT_EQ(2U, GetAndResetSentEventCount());
 }
 
 }  // namespace content