Chromium Code Reviews| Index: content/renderer/input/input_handler_manager.cc |
| diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc |
| index 35ef3b467334d110476a60839acff8a87f27162a..857826bfdd45deddfb4cd76e9f07fd0f9fd42cc2 100644 |
| --- a/content/renderer/input/input_handler_manager.cc |
| +++ b/content/renderer/input/input_handler_manager.cc |
| @@ -36,6 +36,8 @@ InputEventAckState InputEventDispositionToAck( |
| return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| case InputHandlerProxy::DROP_EVENT: |
| return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; |
| + case InputHandlerProxy::NON_BLOCKING: |
| + return INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING; |
| } |
| NOTREACHED(); |
| return INPUT_EVENT_ACK_STATE_UNKNOWN; |
| @@ -141,6 +143,26 @@ void InputHandlerManager::ObserveWheelEventAndResultOnCompositorThread( |
| wheel_event, scroll_result); |
| } |
| +void InputHandlerManager::PassiveInputEventHandledOnMainThread( |
| + int routing_id, |
| + blink::WebInputEvent::Type type) { |
| + task_runner_->PostTask( |
| + FROM_HERE, |
| + base::Bind( |
| + &InputHandlerManager::PassiveInputEventHandledOnCompositorThread, |
| + base::Unretained(this), routing_id, type)); |
| +} |
| + |
| +void InputHandlerManager::PassiveInputEventHandledOnCompositorThread( |
|
aelias_OOO_until_Jul13
2016/01/26 04:50:41
Please add DCHECK(task_runner_->BelongsToCurrentTh
dtapuska
2016/01/26 16:53:15
Done.
|
| + int routing_id, |
| + blink::WebInputEvent::Type handled_type) { |
| + auto it = input_handlers_.find(routing_id); |
| + if (it == input_handlers_.end()) |
| + return; |
| + |
| + client_->PassiveInputEventHandled(routing_id, handled_type); |
| +} |
| + |
| InputEventAckState InputHandlerManager::HandleInputEvent( |
| int routing_id, |
| const WebInputEvent* input_event, |