OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/input/input_handler_manager.h" | 5 #include "content/renderer/input/input_handler_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 } | 60 } |
61 | 61 |
62 InputHandlerManager::~InputHandlerManager() { | 62 InputHandlerManager::~InputHandlerManager() { |
63 client_->SetBoundHandler(InputHandlerManagerClient::Handler()); | 63 client_->SetBoundHandler(InputHandlerManagerClient::Handler()); |
64 } | 64 } |
65 | 65 |
66 void InputHandlerManager::AddInputHandler( | 66 void InputHandlerManager::AddInputHandler( |
67 int routing_id, | 67 int routing_id, |
68 const base::WeakPtr<cc::InputHandler>& input_handler, | 68 const base::WeakPtr<cc::InputHandler>& input_handler, |
69 const base::WeakPtr<RenderViewImpl>& render_view_impl, | 69 const base::WeakPtr<RenderViewImpl>& render_view_impl, |
70 bool enable_smooth_scrolling) { | 70 bool enable_smooth_scrolling, |
| 71 bool enable_wheel_gestures) { |
71 if (task_runner_->BelongsToCurrentThread()) { | 72 if (task_runner_->BelongsToCurrentThread()) { |
72 AddInputHandlerOnCompositorThread( | 73 AddInputHandlerOnCompositorThread( |
73 routing_id, base::ThreadTaskRunnerHandle::Get(), input_handler, | 74 routing_id, base::ThreadTaskRunnerHandle::Get(), input_handler, |
74 render_view_impl, enable_smooth_scrolling); | 75 render_view_impl, enable_smooth_scrolling, enable_wheel_gestures); |
75 } else { | 76 } else { |
76 task_runner_->PostTask( | 77 task_runner_->PostTask( |
77 FROM_HERE, | 78 FROM_HERE, |
78 base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread, | 79 base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread, |
79 base::Unretained(this), routing_id, | 80 base::Unretained(this), routing_id, |
80 base::ThreadTaskRunnerHandle::Get(), input_handler, | 81 base::ThreadTaskRunnerHandle::Get(), input_handler, |
81 render_view_impl, enable_smooth_scrolling)); | 82 render_view_impl, enable_smooth_scrolling, |
| 83 enable_wheel_gestures)); |
82 } | 84 } |
83 } | 85 } |
84 | 86 |
85 void InputHandlerManager::AddInputHandlerOnCompositorThread( | 87 void InputHandlerManager::AddInputHandlerOnCompositorThread( |
86 int routing_id, | 88 int routing_id, |
87 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, | 89 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
88 const base::WeakPtr<cc::InputHandler>& input_handler, | 90 const base::WeakPtr<cc::InputHandler>& input_handler, |
89 const base::WeakPtr<RenderViewImpl>& render_view_impl, | 91 const base::WeakPtr<RenderViewImpl>& render_view_impl, |
90 bool enable_smooth_scrolling) { | 92 bool enable_smooth_scrolling, |
| 93 bool enable_wheel_gestures) { |
91 DCHECK(task_runner_->BelongsToCurrentThread()); | 94 DCHECK(task_runner_->BelongsToCurrentThread()); |
92 | 95 |
93 // The handler could be gone by this point if the compositor has shut down. | 96 // The handler could be gone by this point if the compositor has shut down. |
94 if (!input_handler) | 97 if (!input_handler) |
95 return; | 98 return; |
96 | 99 |
97 // The same handler may be registered for a route multiple times. | 100 // The same handler may be registered for a route multiple times. |
98 if (input_handlers_.count(routing_id) != 0) | 101 if (input_handlers_.count(routing_id) != 0) |
99 return; | 102 return; |
100 | 103 |
101 TRACE_EVENT1("input", | 104 TRACE_EVENT1("input", |
102 "InputHandlerManager::AddInputHandlerOnCompositorThread", | 105 "InputHandlerManager::AddInputHandlerOnCompositorThread", |
103 "result", "AddingRoute"); | 106 "result", "AddingRoute"); |
104 std::unique_ptr<InputHandlerWrapper> wrapper( | 107 std::unique_ptr<InputHandlerWrapper> wrapper(new InputHandlerWrapper( |
105 new InputHandlerWrapper(this, routing_id, main_task_runner, input_handler, | 108 this, routing_id, main_task_runner, input_handler, render_view_impl, |
106 render_view_impl, enable_smooth_scrolling)); | 109 enable_smooth_scrolling, enable_wheel_gestures)); |
107 client_->DidAddInputHandler(routing_id); | 110 client_->DidAddInputHandler(routing_id); |
108 if (synchronous_handler_proxy_client_) { | 111 if (synchronous_handler_proxy_client_) { |
109 synchronous_handler_proxy_client_->DidAddSynchronousHandlerProxy( | 112 synchronous_handler_proxy_client_->DidAddSynchronousHandlerProxy( |
110 routing_id, wrapper->input_handler_proxy()); | 113 routing_id, wrapper->input_handler_proxy()); |
111 } | 114 } |
112 input_handlers_.add(routing_id, std::move(wrapper)); | 115 input_handlers_.add(routing_id, std::move(wrapper)); |
113 } | 116 } |
114 | 117 |
115 void InputHandlerManager::RemoveInputHandler(int routing_id) { | 118 void InputHandlerManager::RemoveInputHandler(int routing_id) { |
116 DCHECK(task_runner_->BelongsToCurrentThread()); | 119 DCHECK(task_runner_->BelongsToCurrentThread()); |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 | 251 |
249 void InputHandlerManager::DidStopFlinging(int routing_id) { | 252 void InputHandlerManager::DidStopFlinging(int routing_id) { |
250 client_->DidStopFlinging(routing_id); | 253 client_->DidStopFlinging(routing_id); |
251 } | 254 } |
252 | 255 |
253 void InputHandlerManager::DidAnimateForInput() { | 256 void InputHandlerManager::DidAnimateForInput() { |
254 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); | 257 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); |
255 } | 258 } |
256 | 259 |
257 } // namespace content | 260 } // namespace content |
OLD | NEW |