Add hooks for flushing input from BeginFrame dispatch on Aura

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"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"

[tdresser, 2015/10/23 12:32:07]

Is this used?

[jdduke (slow), 2015/10/23 18:00:39]

Woops, bad rebase here I think... Removed.

 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/gesture_event_queue.h"
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/browser/renderer_host/input/touch_action_filter.h"
 #include "content/browser/renderer_host/input/touch_event_queue.h"
 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
 #include "content/common/input/input_event_stream_validator.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 
 namespace IPC {
@@ skipping 27 matching lines @@
 
   InputRouterImpl(IPC::Sender* sender,
                   InputRouterClient* client,
                   InputAckHandler* ack_handler,
                   int routing_id,
                   const Config& config);
   ~InputRouterImpl() override;
 
   // InputRouter
   bool SendInput(scoped_ptr<IPC::Message> message) override;
+  void FlushInput(base::TimeTicks flush_time) override;
   void SendMouseEvent(const MouseEventWithLatencyInfo& mouse_event) override;
   void SendWheelEvent(
       const MouseWheelEventWithLatencyInfo& wheel_event) override;
   void SendKeyboardEvent(
       const NativeWebKeyboardEventWithLatencyInfo& key_event) override;
   void SendGestureEvent(
       const GestureEventWithLatencyInfo& gesture_event) override;
   void SendTouchEvent(const TouchEventWithLatencyInfo& touch_event) override;
   const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override;
   void NotifySiteIsMobileOptimized(bool is_mobile_optimized) 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 86 matching lines @@
                        const ui::LatencyInfo& latency,
                        uint32 unique_touch_event_id);
 
   // Called when a touch timeout-affecting bit has changed, in turn toggling the
   // 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
+  // If a flush call has been made, signals a completed flush to the client if
   // all events have been dispatched (i.e., |HasPendingEvents()| is false).
   void SignalFlushedIfNecessary();
 
   int routing_id() const { return routing_id_; }
 
 
   IPC::Sender* sender_;
   InputRouterClient* client_;
   InputAckHandler* ack_handler_;
   int routing_id_;
@@ skipping 42 matching lines @@
   typedef std::deque<NativeWebKeyboardEventWithLatencyInfo> KeyQueue;
   KeyQueue key_queue_;
 
   // The time when an input event was sent to the client.
   base::TimeTicks input_event_start_time_;
 
   // 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.
+  // Whether a |FlushInput()| call has yet been accompanied by a
+  // |DidFlushAllInput()| call to the client.

[tdresser, 2015/10/23 12:32:07]

This leaves the case where we haven't received a |FlushInput()| call at all
ambiguous.

Can we reword to something like, 

Whether we've received a |FlushInput()| call without yet calling
|DidFlashAllInput()| on the client.

[jdduke (slow), 2015/10/23 18:00:39]

Done.

   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_renderer_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_