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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
214 if (it == input_handlers_.end()) { | 214 if (it == input_handlers_.end()) { |
215 TRACE_EVENT1("input", "InputHandlerManager::HandleInputEvent", | 215 TRACE_EVENT1("input", "InputHandlerManager::HandleInputEvent", |
216 "result", "NoInputHandlerFound"); | 216 "result", "NoInputHandlerFound"); |
217 // Oops, we no longer have an interested input handler.. | 217 // Oops, we no longer have an interested input handler.. |
218 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 218 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
219 } | 219 } |
220 | 220 |
221 TRACE_EVENT1("input", "InputHandlerManager::HandleInputEvent", | 221 TRACE_EVENT1("input", "InputHandlerManager::HandleInputEvent", |
222 "result", "EventSentToInputHandlerProxy"); | 222 "result", "EventSentToInputHandlerProxy"); |
223 InputHandlerProxy* proxy = it->second->input_handler_proxy(); | 223 InputHandlerProxy* proxy = it->second->input_handler_proxy(); |
224 if (blink::WebInputEvent::isTouchEventType(input_event->type)) { | |
dtapuska
2016/05/05 20:22:21
this seems odd to repeatedly set a state on touch
| |
225 client_->SetIsFlinging(proxy->isFlinging()); | |
226 } | |
227 | |
224 InputEventAckState input_event_ack_state = InputEventDispositionToAck( | 228 InputEventAckState input_event_ack_state = InputEventDispositionToAck( |
225 proxy->HandleInputEventWithLatencyInfo(*input_event, latency_info)); | 229 proxy->HandleInputEventWithLatencyInfo(*input_event, latency_info)); |
226 switch (input_event_ack_state) { | 230 switch (input_event_ack_state) { |
227 case INPUT_EVENT_ACK_STATE_CONSUMED: | 231 case INPUT_EVENT_ACK_STATE_CONSUMED: |
228 renderer_scheduler_->DidHandleInputEventOnCompositorThread( | 232 renderer_scheduler_->DidHandleInputEventOnCompositorThread( |
229 *input_event, | 233 *input_event, |
230 RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); | 234 RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); |
231 break; | 235 break; |
232 case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: | 236 case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: |
233 renderer_scheduler_->DidHandleInputEventOnCompositorThread( | 237 renderer_scheduler_->DidHandleInputEventOnCompositorThread( |
(...skipping 13 matching lines...) Expand all Loading... | |
247 | 251 |
248 void InputHandlerManager::DidStopFlinging(int routing_id) { | 252 void InputHandlerManager::DidStopFlinging(int routing_id) { |
249 client_->DidStopFlinging(routing_id); | 253 client_->DidStopFlinging(routing_id); |
250 } | 254 } |
251 | 255 |
252 void InputHandlerManager::DidAnimateForInput() { | 256 void InputHandlerManager::DidAnimateForInput() { |
253 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); | 257 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); |
254 } | 258 } |
255 | 259 |
256 } // namespace content | 260 } // namespace content |
OLD | NEW |