Remove is_fling flag for fling intervention

content/renderer/input/main_thread_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 <stddef.h>
 
 #include <new>
 #include <utility>
 #include <vector>
 
@@ skipping 78 matching lines @@
     queue_->HandleEvent(ui::WebInputEventTraits::Clone(event),
                         ui::LatencyInfo(), DISPATCH_TYPE_BLOCKING, ack_result);
   }
 
   void NeedsMainFrame(int routing_id) override { needs_main_frame_ = true; }
 
   WebInputEventQueue<EventWithDispatchType>& event_queue() {
     return queue_->shared_state_.events_;
   }
 
-  void set_is_flinging(bool is_flinging) {
-    queue_->set_is_flinging(is_flinging);
-  }
-
   bool last_touch_start_forced_nonblocking_due_to_fling() {
     return queue_->last_touch_start_forced_nonblocking_due_to_fling_;
   }
 
   void set_enable_fling_passive_listener_flag(bool enable_flag) {
     queue_->enable_fling_passive_listener_flag_ = enable_flag;
   }
 
   void RunPendingTasksWithSimulatedRaf() {
     while (needs_main_frame_ || main_task_runner_->HasPendingTask()) {
@@ skipping 315 matching lines @@
   for (SyntheticWebTouchEvent& event : kEvents)
     HandleEvent(event, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
 
   EXPECT_EQ(3u, event_queue().size());
   EXPECT_TRUE(main_task_runner_->HasPendingTask());
   EXPECT_FALSE(needs_main_frame_);
   main_task_runner_->RunUntilIdle();
 }
 
 TEST_P(MainThreadEventQueueTest, BlockingTouchesDuringFling) {
-  SyntheticWebTouchEvent kEvents[1];
-  kEvents[0].PressPoint(10, 10);
-  kEvents[0].touchStartOrFirstTouchMove = true;
-  set_is_flinging(true);
+  SyntheticWebTouchEvent kEvents;
+  kEvents.PressPoint(10, 10);
+  kEvents.touchStartOrFirstTouchMove = true;
   set_enable_fling_passive_listener_flag(true);
 
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(1u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(0)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(0)->type);
+  EXPECT_EQ(kEvents.size, handled_events_.at(0)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(0)->type);
   EXPECT_TRUE(last_touch_start_forced_nonblocking_due_to_fling());
   const WebTouchEvent* last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(0).get());
-  kEvents[0].dispatchedDuringFling = true;
-  kEvents[0].dispatchType = WebInputEvent::ListenersForcedNonBlockingDueToFling;
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  kEvents.dispatchType = WebInputEvent::ListenersForcedNonBlockingDueToFling;
+  EXPECT_EQ(kEvents, *last_touch_event);
 
-  kEvents[0].MovePoint(0, 30, 30);
+  kEvents.MovePoint(0, 30, 30);
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   EXPECT_EQ((raf_aligned_input_setting_ & kRafAlignedEnabledTouch) == 0,
             main_task_runner_->HasPendingTask());
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(2u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(1)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(1)->type);
+  EXPECT_EQ(kEvents.size, handled_events_.at(1)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(1)->type);
   EXPECT_TRUE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(1).get());
-  kEvents[0].dispatchedDuringFling = true;
-  kEvents[0].dispatchType = WebInputEvent::ListenersForcedNonBlockingDueToFling;
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  kEvents.dispatchType = WebInputEvent::ListenersForcedNonBlockingDueToFling;
+  EXPECT_EQ(kEvents, *last_touch_event);
 
-  kEvents[0].MovePoint(0, 50, 50);
-  kEvents[0].touchStartOrFirstTouchMove = false;
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  kEvents.MovePoint(0, 50, 50);
+  kEvents.touchStartOrFirstTouchMove = false;
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(3u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(2)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(2)->type);
-  EXPECT_TRUE(kEvents[0].dispatchedDuringFling);
-  EXPECT_EQ(kEvents[0].dispatchType, WebInputEvent::Blocking);
+  EXPECT_EQ(kEvents.size, handled_events_.at(2)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(2)->type);
+  EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(2).get());
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  EXPECT_EQ(kEvents, *last_touch_event);
 
-  kEvents[0].ReleasePoint(0);
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  kEvents.ReleasePoint(0);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(4u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(3)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(3)->type);
-  EXPECT_TRUE(kEvents[0].dispatchedDuringFling);
-  EXPECT_EQ(kEvents[0].dispatchType, WebInputEvent::Blocking);
+  EXPECT_EQ(kEvents.size, handled_events_.at(3)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(3)->type);
+  EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(3).get());
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  EXPECT_EQ(kEvents, *last_touch_event);
 }
 
 TEST_P(MainThreadEventQueueTest, BlockingTouchesOutsideFling) {
-  SyntheticWebTouchEvent kEvents[1];
-  kEvents[0].PressPoint(10, 10);
-  kEvents[0].touchStartOrFirstTouchMove = true;
-  set_is_flinging(false);
+  SyntheticWebTouchEvent kEvents;
+  kEvents.PressPoint(10, 10);
+  kEvents.touchStartOrFirstTouchMove = true;
   set_enable_fling_passive_listener_flag(false);
 
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(1u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(0)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(0)->type);
-  EXPECT_FALSE(kEvents[0].dispatchedDuringFling);
-  EXPECT_EQ(kEvents[0].dispatchType, WebInputEvent::Blocking);
+  EXPECT_EQ(kEvents.size, handled_events_.at(0)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(0)->type);
+  EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   const WebTouchEvent* last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(0).get());
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  EXPECT_EQ(kEvents, *last_touch_event);
 
-  set_is_flinging(true);
   set_enable_fling_passive_listener_flag(false);
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(2u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(1)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(1)->type);
-  EXPECT_FALSE(kEvents[0].dispatchedDuringFling);
-  EXPECT_EQ(kEvents[0].dispatchType, WebInputEvent::Blocking);
+  EXPECT_EQ(kEvents.size, handled_events_.at(1)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(1)->type);
+  EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(1).get());
-  kEvents[0].dispatchedDuringFling = true;
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  EXPECT_EQ(kEvents, *last_touch_event);
 
-  set_is_flinging(false);
   set_enable_fling_passive_listener_flag(true);
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(3u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(2)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(2)->type);
-  EXPECT_TRUE(kEvents[0].dispatchedDuringFling);
-  EXPECT_EQ(kEvents[0].dispatchType, WebInputEvent::Blocking);
+  EXPECT_EQ(kEvents.size, handled_events_.at(2)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(2)->type);
+  EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(2).get());
-  kEvents[0].dispatchedDuringFling = false;
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  EXPECT_EQ(kEvents, *last_touch_event);
 
-  kEvents[0].MovePoint(0, 30, 30);
-  HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  kEvents.MovePoint(0, 30, 30);
+  HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(4u, handled_events_.size());
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(3)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(3)->type);
-  EXPECT_FALSE(kEvents[0].dispatchedDuringFling);
-  EXPECT_EQ(kEvents[0].dispatchType, WebInputEvent::Blocking);
+  EXPECT_EQ(kEvents.size, handled_events_.at(3)->size);
+  EXPECT_EQ(kEvents.type, handled_events_.at(3)->type);
+  EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(3).get());
-  EXPECT_EQ(kEvents[0], *last_touch_event);
+  EXPECT_EQ(kEvents, *last_touch_event);
 }
 
 // The boolean parameterized test varies whether rAF aligned input
 // is enabled or not.
 INSTANTIATE_TEST_CASE_P(
     MainThreadEventQueueTests,
     MainThreadEventQueueTest,
     testing::Range(0u,
                    (kRafAlignedEnabledTouch | kRafAlignedEnabledMouse) + 1));
 
 }  // namespace content