| Index: content/renderer/input/input_handler_manager.cc
|
| diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
|
| index a5433de2a302265f09b78d569b5825c49060f79b..54d6e12f47d30f6ce1d083e63c00950f0d0f3aae 100644
|
| --- a/content/renderer/input/input_handler_manager.cc
|
| +++ b/content/renderer/input/input_handler_manager.cc
|
| @@ -51,12 +51,14 @@ InputHandlerManager::~InputHandlerManager() {
|
| void InputHandlerManager::AddInputHandler(
|
| int routing_id,
|
| const base::WeakPtr<cc::InputHandler>& input_handler,
|
| - const base::WeakPtr<RenderViewImpl>& render_view_impl) {
|
| + const base::WeakPtr<RenderViewImpl>& render_view_impl,
|
| + RendererScheduler* render_scheduler) {
|
| if (message_loop_proxy_->BelongsToCurrentThread()) {
|
| AddInputHandlerOnCompositorThread(routing_id,
|
| base::MessageLoopProxy::current(),
|
| input_handler,
|
| - render_view_impl);
|
| + render_view_impl,
|
| + render_scheduler);
|
| } else {
|
| message_loop_proxy_->PostTask(
|
| FROM_HERE,
|
| @@ -65,7 +67,8 @@ void InputHandlerManager::AddInputHandler(
|
| routing_id,
|
| base::MessageLoopProxy::current(),
|
| input_handler,
|
| - render_view_impl));
|
| + render_view_impl,
|
| + render_scheduler));
|
| }
|
| }
|
|
|
| @@ -73,7 +76,8 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
|
| int routing_id,
|
| const scoped_refptr<base::MessageLoopProxy>& main_loop,
|
| const base::WeakPtr<cc::InputHandler>& input_handler,
|
| - const base::WeakPtr<RenderViewImpl>& render_view_impl) {
|
| + const base::WeakPtr<RenderViewImpl>& render_view_impl,
|
| + RendererScheduler* render_scheduler) {
|
| DCHECK(message_loop_proxy_->BelongsToCurrentThread());
|
|
|
| // The handler could be gone by this point if the compositor has shut down.
|
| @@ -88,9 +92,14 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
|
| "InputHandlerManager::AddInputHandlerOnCompositorThread",
|
| "result", "AddingRoute");
|
| client_->DidAddInputHandler(routing_id, input_handler.get());
|
| - input_handlers_.add(routing_id,
|
| + input_handlers_.add(
|
| + routing_id,
|
| make_scoped_ptr(new InputHandlerWrapper(this,
|
| - routing_id, main_loop, input_handler, render_view_impl)));
|
| + routing_id,
|
| + main_loop,
|
| + input_handler,
|
| + render_view_impl,
|
| + render_scheduler)));
|
| }
|
|
|
| void InputHandlerManager::RemoveInputHandler(int routing_id) {
|
|
|