Index: content/renderer/input/input_event_filter.cc |
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc |
index 56799b1128b224d40efe5c5edff70d23b09efa44..7d533a39530ea25f1a4eb9942173e707e5c75b4a 100644 |
--- a/content/renderer/input/input_event_filter.cc |
+++ b/content/renderer/input/input_event_filter.cc |
@@ -71,15 +71,6 @@ void InputEventFilter::SetInputHandlerManager( |
input_handler_manager_ = input_handler_manager; |
} |
-void InputEventFilter::SetIsFlingingInMainThreadEventQueue(int routing_id, |
- bool is_flinging) { |
- RouteQueueMap::iterator iter = route_queues_.find(routing_id); |
- if (iter == route_queues_.end() || !iter->second) |
- return; |
- |
- iter->second->set_is_flinging(is_flinging); |
-} |
- |
void InputEventFilter::RegisterRoutingID(int routing_id) { |
base::AutoLock locked(routes_lock_); |
routes_.insert(routing_id); |
@@ -99,12 +90,7 @@ void InputEventFilter::DidOverscroll(int routing_id, |
new InputHostMsg_DidOverscroll(routing_id, params))); |
} |
-void InputEventFilter::DidStartFlinging(int routing_id) { |
- SetIsFlingingInMainThreadEventQueue(routing_id, true); |
-} |
- |
void InputEventFilter::DidStopFlinging(int routing_id) { |
- SetIsFlingingInMainThreadEventQueue(routing_id, false); |
SendMessage(base::MakeUnique<InputHostMsg_DidStopFlinging>(routing_id)); |
} |
@@ -251,6 +237,7 @@ void InputEventFilter::DidForwardToHandlerAndOverscroll( |
WebInputEvent::Type type = event->type; |
if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING || |
+ ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING || |
ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) { |
DCHECK(!overscroll_params); |
RouteQueueMap::iterator iter = route_queues_.find(routing_id); |