Index: content/browser/renderer_host/input/input_router_impl.cc |
diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc |
index 7aabd60931cdf3677b88e6e5c573db13bad0fc10..8ecb37b4567999373caaed93e7c86cf445a09a7e 100644 |
--- a/content/browser/renderer_host/input/input_router_impl.cc |
+++ b/content/browser/renderer_host/input/input_router_impl.cc |
@@ -57,8 +57,7 @@ const char* GetEventAckName(InputEventAckState ack_result) { |
} // namespace |
-InputRouterImpl::Config::Config() { |
-} |
+InputRouterImpl::Config::Config() {} |
InputRouterImpl::InputRouterImpl(IPC::Sender* sender, |
InputRouterClient* client, |
@@ -105,6 +104,11 @@ bool InputRouterImpl::SendInput(scoped_ptr<IPC::Message> message) { |
} |
} |
+void InputRouterImpl::FlushInput(base::TimeTicks flush_time) { |
+ flush_requested_ = true; |
+ SignalFlushedIfNecessary(); |
+} |
+ |
void InputRouterImpl::SendMouseEvent( |
const MouseEventWithLatencyInfo& mouse_event) { |
if (mouse_event.event.type == WebInputEvent::MouseDown && |
@@ -242,11 +246,6 @@ void InputRouterImpl::NotifySiteIsMobileOptimized(bool is_mobile_optimized) { |
touch_event_queue_.SetIsMobileOptimizedSite(is_mobile_optimized); |
} |
-void InputRouterImpl::RequestNotificationWhenFlushed() { |
- flush_requested_ = true; |
- SignalFlushedIfNecessary(); |
-} |
- |
bool InputRouterImpl::HasPendingEvents() const { |
return !touch_event_queue_.empty() || |
!gesture_event_queue_.empty() || |
@@ -320,7 +319,7 @@ bool InputRouterImpl::SendSelectMessage( |
} |
bool InputRouterImpl::SendMoveCaret(scoped_ptr<IPC::Message> message) { |
- DCHECK(message->type() == InputMsg_MoveCaret::ID); |
+ DCHECK_EQ(message->type(), InputMsg_MoveCaret::ID); |
if (move_caret_pending_) { |
next_move_caret_ = message.Pass(); |
return true; |
@@ -642,7 +641,7 @@ void InputRouterImpl::SignalFlushedIfNecessary() { |
return; |
flush_requested_ = false; |
- client_->DidFlush(); |
+ client_->DidFlushAllInput(); |
} |
} // namespace content |