| 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 6ffc432e7321bf779d1cfa7d452e29977d70ee32..35ef3b467334d110476a60839acff8a87f27162a 100644
|
| --- a/content/renderer/input/input_handler_manager.cc
|
| +++ b/content/renderer/input/input_handler_manager.cc
|
| @@ -62,18 +62,21 @@ 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,
|
| + bool enable_smooth_scrolling) {
|
| if (task_runner_->BelongsToCurrentThread()) {
|
| AddInputHandlerOnCompositorThread(routing_id,
|
| base::ThreadTaskRunnerHandle::Get(),
|
| - input_handler, render_view_impl);
|
| + input_handler, render_view_impl,
|
| + enable_smooth_scrolling);
|
| } else {
|
| task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread,
|
| base::Unretained(this), routing_id,
|
| base::ThreadTaskRunnerHandle::Get(), input_handler,
|
| - render_view_impl));
|
| + render_view_impl,
|
| + enable_smooth_scrolling));
|
| }
|
| }
|
|
|
| @@ -81,7 +84,8 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
|
| int routing_id,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
|
| const base::WeakPtr<cc::InputHandler>& input_handler,
|
| - const base::WeakPtr<RenderViewImpl>& render_view_impl) {
|
| + const base::WeakPtr<RenderViewImpl>& render_view_impl,
|
| + bool enable_smooth_scrolling) {
|
| DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| // The handler could be gone by this point if the compositor has shut down.
|
| @@ -96,7 +100,8 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
|
| "InputHandlerManager::AddInputHandlerOnCompositorThread",
|
| "result", "AddingRoute");
|
| scoped_ptr<InputHandlerWrapper> wrapper(new InputHandlerWrapper(
|
| - this, routing_id, main_task_runner, input_handler, render_view_impl));
|
| + this, routing_id, main_task_runner, input_handler, render_view_impl,
|
| + enable_smooth_scrolling));
|
| client_->DidAddInputHandler(routing_id, wrapper->input_handler_proxy());
|
| input_handlers_.add(routing_id, std::move(wrapper));
|
| }
|
|
|