| 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 184 |
| 185 InputHandlerProxy* proxy = it->second->input_handler_proxy(); | 185 InputHandlerProxy* proxy = it->second->input_handler_proxy(); |
| 186 DCHECK(proxy->scroll_elasticity_controller()); | 186 DCHECK(proxy->scroll_elasticity_controller()); |
| 187 proxy->scroll_elasticity_controller()->ObserveGestureEventAndResult( | 187 proxy->scroll_elasticity_controller()->ObserveGestureEventAndResult( |
| 188 gesture_event, scroll_result); | 188 gesture_event, scroll_result); |
| 189 } | 189 } |
| 190 | 190 |
| 191 void InputHandlerManager::NotifyInputEventHandledOnMainThread( | 191 void InputHandlerManager::NotifyInputEventHandledOnMainThread( |
| 192 int routing_id, | 192 int routing_id, |
| 193 blink::WebInputEvent::Type type, | 193 blink::WebInputEvent::Type type, |
| 194 blink::WebInputEventResult result, |
| 194 InputEventAckState ack_result) { | 195 InputEventAckState ack_result) { |
| 195 client_->NotifyInputEventHandled(routing_id, type, ack_result); | 196 client_->NotifyInputEventHandled(routing_id, type, result, ack_result); |
| 196 } | 197 } |
| 197 | 198 |
| 198 void InputHandlerManager::ProcessRafAlignedInputOnMainThread(int routing_id) { | 199 void InputHandlerManager::ProcessRafAlignedInputOnMainThread(int routing_id) { |
| 199 client_->ProcessRafAlignedInput(routing_id); | 200 client_->ProcessRafAlignedInput(routing_id); |
| 200 } | 201 } |
| 201 | 202 |
| 202 void InputHandlerManager::HandleInputEvent( | 203 void InputHandlerManager::HandleInputEvent( |
| 203 int routing_id, | 204 int routing_id, |
| 204 blink::WebScopedInputEvent input_event, | 205 blink::WebScopedInputEvent input_event, |
| 205 const ui::LatencyInfo& latency_info, | 206 const ui::LatencyInfo& latency_info, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 void InputHandlerManager::DispatchNonBlockingEventToMainThread( | 279 void InputHandlerManager::DispatchNonBlockingEventToMainThread( |
| 279 int routing_id, | 280 int routing_id, |
| 280 blink::WebScopedInputEvent event, | 281 blink::WebScopedInputEvent event, |
| 281 const ui::LatencyInfo& latency_info) { | 282 const ui::LatencyInfo& latency_info) { |
| 282 DCHECK(task_runner_->BelongsToCurrentThread()); | 283 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 283 client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event), | 284 client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event), |
| 284 latency_info); | 285 latency_info); |
| 285 } | 286 } |
| 286 | 287 |
| 287 } // namespace content | 288 } // namespace content |
| OLD | NEW |