Restore simple fling status bookkeeping

content/browser/renderer_host/input/input_router_impl_unittest.cc

 // Copyright 2013 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 <math.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 258 matching lines @@
   }
 
   void SendInputEventACK(blink::WebInputEvent::Type type,
                          InputEventAckState ack_result) {
     InputHostMsg_HandleInputEvent_ACK_Params ack;
     ack.type = type;
     ack.state = ack_result;
     input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack));
   }
 
-  void NotifyDidStopFlinging() {
-    input_router_->OnMessageReceived(InputHostMsg_DidStopFlinging(0));
-  }
-
   InputRouterImpl* input_router() const {
     return input_router_.get();
   }
 
   bool TouchEventQueueEmpty() const {
     return input_router()->touch_event_queue_.empty();
   }
 
   bool TouchEventTimeoutEnabled() const {
     return input_router()->touch_event_queue_.IsAckTimeoutEnabled();
@@ skipping 723 matching lines @@
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureTapCancel,
       WebInputEvent::GestureScrollBegin,
       WebInputEvent::GestureScrollUpdate,
       WebInputEvent::GesturePinchBegin,
       WebInputEvent::GesturePinchUpdate,
       WebInputEvent::GesturePinchEnd,
       WebInputEvent::GestureScrollEnd};
   for (size_t i = 0; i < arraysize(eventTypes); ++i) {
     WebInputEvent::Type type = eventTypes[i];
-    SCOPED_TRACE(WebInputEventTraits::GetName(type));
     if (!WebInputEventTraits::IgnoresAckDisposition(GetEventWithType(type))) {
       SimulateGestureEvent(type, blink::WebGestureDeviceTouchscreen);
       EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
       EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
       EXPECT_EQ(1, client_->in_flight_event_count());
       EXPECT_TRUE(HasPendingEvents());
 
-      SendInputEventACK(type, INPUT_EVENT_ACK_STATE_CONSUMED);
+      SendInputEventACK(type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
       EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
       EXPECT_EQ(1U, ack_handler_->GetAndResetAckCount());
       EXPECT_EQ(0, client_->in_flight_event_count());
-
-      // A GestureFlingCancel will be dropped unless there's an active
-      // fling, and an active fling is considered a "pending" event. This rather
-      // nasty bookkeeping is necessary to ensure the fling cancel gets properly
-      // dispatched and the pending event expectations are valid.
-      if (type == blink::WebInputEvent::GestureFlingCancel)
-        NotifyDidStopFlinging();
-      if (type != blink::WebInputEvent::GestureFlingStart)
-        EXPECT_FALSE(HasPendingEvents());
-
+      EXPECT_FALSE(HasPendingEvents());
       continue;
     }
 
     SimulateGestureEvent(type, blink::WebGestureDeviceTouchscreen);
     EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
     EXPECT_EQ(1U, ack_handler_->GetAndResetAckCount());
     EXPECT_EQ(0, client_->in_flight_event_count());
     EXPECT_FALSE(HasPendingEvents());
   }
 }
@@ skipping 550 matching lines @@
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
   EXPECT_TRUE(HasPendingEvents());
 
   // The final ack'ed gesture should trigger the DidFlush.
   SendInputEventACK(WebInputEvent::GesturePinchUpdate,
                     INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(1U, GetAndResetDidFlushCount());
   EXPECT_FALSE(HasPendingEvents());
 }
 
-// Test that the router will call the client's |DidFlush| after all fling
-// animations have completed.
-TEST_F(InputRouterImplTest, InputFlushAfterFling) {
-  EXPECT_FALSE(HasPendingEvents());
-
-  // Simulate a fling.
-  SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
-                       blink::WebGestureDeviceTouchscreen);
-  SimulateGestureEvent(WebInputEvent::GestureFlingStart,
-                       blink::WebGestureDeviceTouchscreen);
-  EXPECT_TRUE(HasPendingEvents());
-
-  // If the fling is unconsumed, the flush is complete.
-  RequestNotificationWhenFlushed();
-  EXPECT_EQ(0U, GetAndResetDidFlushCount());
-  SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
-                       blink::WebGestureDeviceTouchscreen);
-  SendInputEventACK(WebInputEvent::GestureFlingStart,
-                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
-  EXPECT_FALSE(HasPendingEvents());
-  EXPECT_EQ(1U, GetAndResetDidFlushCount());
-
-  // Simulate a second fling.
-  SimulateGestureEvent(WebInputEvent::GestureFlingStart,
-                       blink::WebGestureDeviceTouchscreen);
-  EXPECT_TRUE(HasPendingEvents());
-
-  // If the fling is consumed, the flush is complete only when the renderer
-  // reports that is has ended.
-  RequestNotificationWhenFlushed();
-  EXPECT_EQ(0U, GetAndResetDidFlushCount());
-  SendInputEventACK(WebInputEvent::GestureFlingStart,
-                    INPUT_EVENT_ACK_STATE_CONSUMED);
-  EXPECT_TRUE(HasPendingEvents());
-  EXPECT_EQ(0U, GetAndResetDidFlushCount());
-
-  // The fling end notification should signal that the router is flushed.
-  NotifyDidStopFlinging();
-  EXPECT_EQ(1U, GetAndResetDidFlushCount());
-}
-
 // Test that GesturePinchUpdate is handled specially for trackpad
 TEST_F(InputRouterImplTest, TouchpadPinchUpdate) {
   // GesturePinchUpdate for trackpad sends synthetic wheel events.
   // Note that the Touchscreen case is verified as NOT doing this as
   // part of the ShowPressIsInOrder test.
 
   SimulateGesturePinchUpdateEvent(
       1.5f, 20, 25, 0, blink::WebGestureDeviceTouchpad);
 
   // Verify we actually sent a special wheel event to the renderer.
@@ skipping 125 matching lines @@
   client_overscroll = client_->GetAndResetOverscroll();
   EXPECT_EQ(wheel_overscroll.accumulated_overscroll,
             client_overscroll.accumulated_overscroll);
   EXPECT_EQ(wheel_overscroll.latest_overscroll_delta,
             client_overscroll.latest_overscroll_delta);
   EXPECT_EQ(wheel_overscroll.current_fling_velocity,
             client_overscroll.current_fling_velocity);
 }
 
 }  // namespace content