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 c8b5b682e43f16422accb633fcca23fc578fd6ac..f3549b1edaa78e522218e019878a23808d454678 100644 |
--- a/content/renderer/input/input_handler_manager.cc |
+++ b/content/renderer/input/input_handler_manager.cc |
@@ -35,6 +35,8 @@ InputEventAckState InputEventDispositionToAck( |
return INPUT_EVENT_ACK_STATE_CONSUMED; |
case InputHandlerProxy::DID_NOT_HANDLE: |
return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
+ case InputHandlerProxy::DID_NOT_HANDLE_NON_BLOCKING: |
+ return INPUT_EVENT_ACK_STATE_NOT_CONSUMED_NON_BLOCKING; |
case InputHandlerProxy::DROP_EVENT: |
return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; |
case InputHandlerProxy::DID_HANDLE_NON_BLOCKING: |
@@ -205,7 +207,6 @@ void InputHandlerManager::HandleInputEvent( |
DCHECK(task_runner_->BelongsToCurrentThread()); |
TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent", |
"type", WebInputEvent::GetName(input_event->type)); |
- |
auto it = input_handlers_.find(routing_id); |
if (it == input_handlers_.end()) { |
TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", |
@@ -240,6 +241,7 @@ void InputHandlerManager::DidHandleInputEventAndOverscroll( |
RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); |
break; |
case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: |
+ case INPUT_EVENT_ACK_STATE_NOT_CONSUMED_NON_BLOCKING: |
renderer_scheduler_->DidHandleInputEventOnCompositorThread( |
*input_event, |
RendererScheduler::InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD); |
@@ -256,10 +258,6 @@ void InputHandlerManager::DidOverscroll(int routing_id, |
client_->DidOverscroll(routing_id, params); |
} |
-void InputHandlerManager::DidStartFlinging(int routing_id) { |
- client_->DidStartFlinging(routing_id); |
-} |
- |
void InputHandlerManager::DidStopFlinging(int routing_id) { |
client_->DidStopFlinging(routing_id); |
} |