Index: content/browser/renderer_host/render_widget_host_impl.cc |
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
index c89bba6c56f4cf3c9c60626f85bef724b0c5b06e..6447918739f2cc6036ca53c0af23b0e1ab4c7328 100644 |
--- a/content/browser/renderer_host/render_widget_host_impl.cc |
+++ b/content/browser/renderer_host/render_widget_host_impl.cc |
@@ -385,15 +385,10 @@ void RenderWidgetHostImpl::SuppressNextCharEvents() { |
suppress_next_char_events_ = true; |
} |
-void RenderWidgetHostImpl::FlushInput() { |
- input_router_->RequestNotificationWhenFlushed(); |
+void RenderWidgetHostImpl::FlushInput(base::TimeTicks frame_time) { |
if (synthetic_gesture_controller_) |
- synthetic_gesture_controller_->Flush(base::TimeTicks::Now()); |
-} |
- |
-void RenderWidgetHostImpl::SetNeedsFlush() { |
- if (view_) |
- view_->OnSetNeedsFlushInput(); |
+ synthetic_gesture_controller_->Flush(frame_time); |
+ input_router_->FlushInput(frame_time); |
} |
void RenderWidgetHostImpl::Init() { |
@@ -1883,9 +1878,14 @@ void RenderWidgetHostImpl::OnHasTouchEventHandlers(bool has_handlers) { |
has_touch_handler_ = has_handlers; |
} |
-void RenderWidgetHostImpl::DidFlush() { |
+void RenderWidgetHostImpl::SetNeedsFlushInput() { |
+ if (view_) |
+ view_->OnSetNeedsFlushInput(); |
+} |
+ |
+void RenderWidgetHostImpl::DidFlushAllInput() { |
if (synthetic_gesture_controller_) |
- synthetic_gesture_controller_->OnDidFlushInput(); |
+ synthetic_gesture_controller_->OnDidFlushAllInput(); |
} |
void RenderWidgetHostImpl::DidOverscroll(const DidOverscrollParams& params) { |