Index: content/browser/renderer_host/input/input_router_impl.h |
diff --git a/content/browser/renderer_host/input/input_router_impl.h b/content/browser/renderer_host/input/input_router_impl.h |
index e1ea09a149b39b226d5c2d9e4164486180950f21..189d93ddd047fa2aa730ab2647ea2d952969c9ae 100644 |
--- a/content/browser/renderer_host/input/input_router_impl.h |
+++ b/content/browser/renderer_host/input/input_router_impl.h |
@@ -9,6 +9,7 @@ |
#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" |
@@ -56,6 +57,7 @@ class CONTENT_EXPORT InputRouterImpl |
// 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; |
@@ -66,7 +68,6 @@ class CONTENT_EXPORT InputRouterImpl |
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 |
@@ -173,7 +174,7 @@ private: |
// 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(); |
@@ -236,8 +237,8 @@ private: |
// 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 |
jdduke (slow)
2015/10/23 18:00:39
Done.
|
bool flush_requested_; |
// Whether there are any active flings in the renderer. As the fling |