Signal input flush when all flings have terminated

content/browser/renderer_host/input/input_router_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
 
 #include <queue>
 
 #include "base/basictypes.h"
@@ skipping 38 matching lines @@
   };
 
   InputRouterImpl(IPC::Sender* sender,
                   InputRouterClient* client,
                   InputAckHandler* ack_handler,
                   int routing_id,
                   const Config& config);
   ~InputRouterImpl() override;
 
   // InputRouter
-  void Flush() override;
   bool SendInput(scoped_ptr<IPC::Message> message) override;
   void SendMouseEvent(const MouseEventWithLatencyInfo& mouse_event) override;
   void SendWheelEvent(
       const MouseWheelEventWithLatencyInfo& wheel_event) override;
   void SendKeyboardEvent(const NativeWebKeyboardEvent& key_event,
                          const ui::LatencyInfo& latency_info,
                          bool is_keyboard_shortcut) override;
   void SendGestureEvent(
       const GestureEventWithLatencyInfo& gesture_event) override;
   void SendTouchEvent(const TouchEventWithLatencyInfo& touch_event) override;
   const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override;
   void OnViewUpdated(int view_flags) override;
+  void RequestNotificationWhenFlushed() override;
   bool HasPendingEvents() const override;
 
   // IPC::Listener
   bool OnMessageReceived(const IPC::Message& message) override;
 
 private:
   friend class InputRouterImplTest;
 
   // TouchpadTapSuppressionControllerClient
   void SendMouseEventImmediately(
@@ skipping 41 matching lines @@
                        const ui::LatencyInfo& latency_info,
                        bool is_keyboard_shortcut);
 
   // IPC message handlers
   void OnInputEventAck(const InputHostMsg_HandleInputEvent_ACK_Params& ack);
   void OnDidOverscroll(const DidOverscrollParams& params);
   void OnMsgMoveCaretAck();
   void OnSelectMessageAck();
   void OnHasTouchEventHandlers(bool has_handlers);
   void OnSetTouchAction(TouchAction touch_action);
+  void OnFlingingStopped();
 
   // Indicates the source of an ack provided to |ProcessInputEventAck()|.
   // The source is tracked by |current_ack_source_|, which aids in ack routing.
   enum AckSource {
     RENDERER,
     CLIENT,
     IGNORING_DISPOSITION,
     ACK_SOURCE_NONE
   };
   // Note: This function may result in |this| being deleted, and as such
@@ skipping 31 matching lines @@
   // touch ack timeout feature of the |touch_event_queue_| as appropriate. Input
   // to that determination includes current view properties and the allowed
   // touch action. Note that this will only affect platforms that have a
   // non-zero touch timeout configuration.
   void UpdateTouchAckTimeoutEnabled();
 
   // If a flush has been requested, signals a completed flush to the client if
   // all events have been dispatched (i.e., |HasPendingEvents()| is false).
   void SignalFlushedIfNecessary();
 
-  bool IsInOverscrollGesture() const;
-
   int routing_id() const { return routing_id_; }
 
 
   IPC::Sender* sender_;
   InputRouterClient* client_;
   InputAckHandler* ack_handler_;
   int routing_id_;
 
   // (Similar to |mouse_move_pending_|.) True while waiting for SelectRange_ACK
   // or MoveRangeSelectionExtent_ACK.
@@ skipping 45 matching lines @@
   int current_view_flags_;
 
   // The source of the ack within the scope of |ProcessInputEventAck()|.
   // Defaults to ACK_SOURCE_NONE.
   AckSource current_ack_source_;
 
   // Whether a call to |Flush()| has yet been accompanied by a |DidFlush()| call
   // to the client_ after all events have been dispatched/acked.
   bool flush_requested_;
 
+  // Whether there are any active flings in the renderer. As the fling
+  // end notification is asynchronous, we use a count rather than a boolean
+  // to avoid races in bookkeeping when starting a new fling.
+  int active_fling_count_;
+
   TouchEventQueue touch_event_queue_;
   GestureEventQueue gesture_event_queue_;
   TouchActionFilter touch_action_filter_;
   InputEventStreamValidator input_stream_validator_;
   InputEventStreamValidator output_stream_validator_;
 
   DISALLOW_COPY_AND_ASSIGN(InputRouterImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_