| 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 edd21fe5987575faff070ae5dc9e50fd355d00f0..d02ef94faec1d1abddca574dda6956c7b6744131 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -28,6 +28,7 @@
|
| #include "content/browser/renderer_host/backing_store.h"
|
| #include "content/browser/renderer_host/backing_store_manager.h"
|
| #include "content/browser/renderer_host/dip_util.h"
|
| +#include "content/browser/renderer_host/input/buffered_input_router.h"
|
| #include "content/browser/renderer_host/input/immediate_input_router.h"
|
| #include "content/browser/renderer_host/overscroll_controller.h"
|
| #include "content/browser/renderer_host/render_process_host_impl.h"
|
| @@ -185,7 +186,8 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
|
| for (size_t i = 0; i < g_created_callbacks.Get().size(); i++)
|
| g_created_callbacks.Get().at(i).Run(this);
|
|
|
| - input_router_.reset(new ImmediateInputRouter(process, this, routing_id_));
|
| + input_router_.reset(
|
| + new ImmediateInputRouter(process, this, this, routing_id_));
|
|
|
| #if defined(USE_AURA)
|
| bool overscroll_enabled = CommandLine::ForCurrentProcess()->
|
| @@ -473,7 +475,7 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) {
|
|
|
| bool RenderWidgetHostImpl::Send(IPC::Message* msg) {
|
| if (IPC_MESSAGE_ID_CLASS(msg->type()) == InputMsgStart)
|
| - return input_router_->SendInput(msg);
|
| + return input_router_->SendInput(make_scoped_ptr(msg));
|
|
|
| return process_->Send(msg);
|
| }
|
| @@ -1200,7 +1202,8 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,
|
| waiting_for_screen_rects_ack_ = false;
|
|
|
| // Reset to ensure that input routing works with a new renderer.
|
| - input_router_.reset(new ImmediateInputRouter(process_, this, routing_id_));
|
| + input_router_.reset(
|
| + new ImmediateInputRouter(process_, this, this, routing_id_));
|
|
|
| if (overscroll_controller_)
|
| overscroll_controller_->Reset();
|
| @@ -2067,6 +2070,12 @@ bool RenderWidgetHostImpl::OnSendGestureEventImmediately(
|
| return !IgnoreInputEvents();
|
| }
|
|
|
| +void RenderWidgetHostImpl::SetNeedsFlush() {
|
| +}
|
| +
|
| +void RenderWidgetHostImpl::DidFlush() {
|
| +}
|
| +
|
| void RenderWidgetHostImpl::OnKeyboardEventAck(
|
| const NativeWebKeyboardEvent& event,
|
| InputEventAckState ack_result) {
|
|
|