| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 InputEventAckState ack_result) { | 195 InputEventAckState ack_result) { |
| 196 client_->NotifyInputEventHandled(routing_id, type, result, ack_result); | 196 client_->NotifyInputEventHandled(routing_id, type, result, ack_result); |
| 197 } | 197 } |
| 198 | 198 |
| 199 void InputHandlerManager::ProcessRafAlignedInputOnMainThread(int routing_id) { | 199 void InputHandlerManager::ProcessRafAlignedInputOnMainThread(int routing_id) { |
| 200 client_->ProcessRafAlignedInput(routing_id); | 200 client_->ProcessRafAlignedInput(routing_id); |
| 201 } | 201 } |
| 202 | 202 |
| 203 void InputHandlerManager::HandleInputEvent( | 203 void InputHandlerManager::HandleInputEvent( |
| 204 int routing_id, | 204 int routing_id, |
| 205 blink::WebScopedInputEvent input_event, | 205 ui::WebScopedInputEvent input_event, |
| 206 const ui::LatencyInfo& latency_info, | 206 const ui::LatencyInfo& latency_info, |
| 207 const InputEventAckStateCallback& callback) { | 207 const InputEventAckStateCallback& callback) { |
| 208 DCHECK(task_runner_->BelongsToCurrentThread()); | 208 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 209 TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent", | 209 TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent", |
| 210 "type", WebInputEvent::GetName(input_event->type())); | 210 "type", WebInputEvent::GetName(input_event->type())); |
| 211 | 211 |
| 212 auto it = input_handlers_.find(routing_id); | 212 auto it = input_handlers_.find(routing_id); |
| 213 if (it == input_handlers_.end()) { | 213 if (it == input_handlers_.end()) { |
| 214 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", | 214 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", |
| 215 "result", "NoInputHandlerFound"); | 215 "result", "NoInputHandlerFound"); |
| 216 // Oops, we no longer have an interested input handler.. | 216 // Oops, we no longer have an interested input handler.. |
| 217 callback.Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, std::move(input_event), | 217 callback.Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, std::move(input_event), |
| 218 latency_info, nullptr); | 218 latency_info, nullptr); |
| 219 return; | 219 return; |
| 220 } | 220 } |
| 221 | 221 |
| 222 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", | 222 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", |
| 223 "result", "EventSentToInputHandlerProxy"); | 223 "result", "EventSentToInputHandlerProxy"); |
| 224 InputHandlerProxy* proxy = it->second->input_handler_proxy(); | 224 InputHandlerProxy* proxy = it->second->input_handler_proxy(); |
| 225 proxy->HandleInputEventWithLatencyInfo( | 225 proxy->HandleInputEventWithLatencyInfo( |
| 226 std::move(input_event), latency_info, | 226 std::move(input_event), latency_info, |
| 227 base::Bind(&InputHandlerManager::DidHandleInputEventAndOverscroll, | 227 base::Bind(&InputHandlerManager::DidHandleInputEventAndOverscroll, |
| 228 weak_ptr_factory_.GetWeakPtr(), callback)); | 228 weak_ptr_factory_.GetWeakPtr(), callback)); |
| 229 } | 229 } |
| 230 | 230 |
| 231 void InputHandlerManager::DidHandleInputEventAndOverscroll( | 231 void InputHandlerManager::DidHandleInputEventAndOverscroll( |
| 232 const InputEventAckStateCallback& callback, | 232 const InputEventAckStateCallback& callback, |
| 233 InputHandlerProxy::EventDisposition event_disposition, | 233 InputHandlerProxy::EventDisposition event_disposition, |
| 234 blink::WebScopedInputEvent input_event, | 234 ui::WebScopedInputEvent input_event, |
| 235 const ui::LatencyInfo& latency_info, | 235 const ui::LatencyInfo& latency_info, |
| 236 std::unique_ptr<ui::DidOverscrollParams> overscroll_params) { | 236 std::unique_ptr<ui::DidOverscrollParams> overscroll_params) { |
| 237 InputEventAckState input_event_ack_state = | 237 InputEventAckState input_event_ack_state = |
| 238 InputEventDispositionToAck(event_disposition); | 238 InputEventDispositionToAck(event_disposition); |
| 239 switch (input_event_ack_state) { | 239 switch (input_event_ack_state) { |
| 240 case INPUT_EVENT_ACK_STATE_CONSUMED: | 240 case INPUT_EVENT_ACK_STATE_CONSUMED: |
| 241 renderer_scheduler_->DidHandleInputEventOnCompositorThread( | 241 renderer_scheduler_->DidHandleInputEventOnCompositorThread( |
| 242 *input_event, | 242 *input_event, |
| 243 RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); | 243 RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); |
| 244 break; | 244 break; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 271 void InputHandlerManager::NeedsMainFrame(int routing_id) { | 271 void InputHandlerManager::NeedsMainFrame(int routing_id) { |
| 272 DCHECK(task_runner_->BelongsToCurrentThread()); | 272 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 273 auto it = input_handlers_.find(routing_id); | 273 auto it = input_handlers_.find(routing_id); |
| 274 if (it == input_handlers_.end()) | 274 if (it == input_handlers_.end()) |
| 275 return; | 275 return; |
| 276 it->second->NeedsMainFrame(); | 276 it->second->NeedsMainFrame(); |
| 277 } | 277 } |
| 278 | 278 |
| 279 void InputHandlerManager::DispatchNonBlockingEventToMainThread( | 279 void InputHandlerManager::DispatchNonBlockingEventToMainThread( |
| 280 int routing_id, | 280 int routing_id, |
| 281 blink::WebScopedInputEvent event, | 281 ui::WebScopedInputEvent event, |
| 282 const ui::LatencyInfo& latency_info) { | 282 const ui::LatencyInfo& latency_info) { |
| 283 DCHECK(task_runner_->BelongsToCurrentThread()); | 283 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 284 client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event), | 284 client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event), |
| 285 latency_info); | 285 latency_info); |
| 286 } | 286 } |
| 287 | 287 |
| 288 } // namespace content | 288 } // namespace content |
| OLD | NEW |