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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 std::unique_ptr<ui::DidOverscrollParams> overscroll_params) { | 235 std::unique_ptr<ui::DidOverscrollParams> overscroll_params) { |
236 InputEventAckState input_event_ack_state = | 236 InputEventAckState input_event_ack_state = |
237 InputEventDispositionToAck(event_disposition); | 237 InputEventDispositionToAck(event_disposition); |
238 switch (input_event_ack_state) { | 238 switch (input_event_ack_state) { |
239 case INPUT_EVENT_ACK_STATE_CONSUMED: | 239 case INPUT_EVENT_ACK_STATE_CONSUMED: |
240 renderer_scheduler_->DidHandleInputEventOnCompositorThread( | 240 renderer_scheduler_->DidHandleInputEventOnCompositorThread( |
241 *input_event, | 241 *input_event, |
242 RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); | 242 RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); |
243 break; | 243 break; |
244 case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: | 244 case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: |
| 245 case INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING: |
245 renderer_scheduler_->DidHandleInputEventOnCompositorThread( | 246 renderer_scheduler_->DidHandleInputEventOnCompositorThread( |
246 *input_event, | 247 *input_event, |
247 RendererScheduler::InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD); | 248 RendererScheduler::InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD); |
248 break; | 249 break; |
249 default: | 250 default: |
250 break; | 251 break; |
251 } | 252 } |
252 callback.Run(input_event_ack_state, std::move(input_event), latency_info, | 253 callback.Run(input_event_ack_state, std::move(input_event), latency_info, |
253 std::move(overscroll_params)); | 254 std::move(overscroll_params)); |
254 } | 255 } |
(...skipping 22 matching lines...) Expand all Loading... |
277 void InputHandlerManager::DispatchNonBlockingEventToMainThread( | 278 void InputHandlerManager::DispatchNonBlockingEventToMainThread( |
278 int routing_id, | 279 int routing_id, |
279 ui::ScopedWebInputEvent event, | 280 ui::ScopedWebInputEvent event, |
280 const ui::LatencyInfo& latency_info) { | 281 const ui::LatencyInfo& latency_info) { |
281 DCHECK(task_runner_->BelongsToCurrentThread()); | 282 DCHECK(task_runner_->BelongsToCurrentThread()); |
282 client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event), | 283 client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event), |
283 latency_info); | 284 latency_info); |
284 } | 285 } |
285 | 286 |
286 } // namespace content | 287 } // namespace content |
OLD | NEW |