| Index: content/browser/renderer_host/input/gesture_event_filter.cc
|
| diff --git a/content/browser/renderer_host/input/gesture_event_filter.cc b/content/browser/renderer_host/input/gesture_event_filter.cc
|
| index 62fcb9c34fc20f2fefd547b4c3eafde17eb7ff14..1a394d582065a51c85dcfa41e5495ed0d8104acf 100644
|
| --- a/content/browser/renderer_host/input/gesture_event_filter.cc
|
| +++ b/content/browser/renderer_host/input/gesture_event_filter.cc
|
| @@ -162,19 +162,12 @@ bool GestureEventFilter::ShouldForwardForCoalescing(
|
| break;
|
| }
|
| EnqueueEvent(gesture_event);
|
| -
|
| - // Ensure that if the added event ignores its ack, it is fired and
|
| - // removed from |coalesced_gesture_events_|.
|
| - SendEventsIgnoringAck();
|
| return ShouldHandleEventNow();
|
| }
|
|
|
| void GestureEventFilter::ProcessGestureAck(InputEventAckState ack_result,
|
| WebInputEvent::Type type,
|
| const ui::LatencyInfo& latency) {
|
| - if (ShouldIgnoreAckForGestureType(type))
|
| - return;
|
| -
|
| if (coalesced_gesture_events_.empty()) {
|
| DLOG(ERROR) << "Received unexpected ACK for event type " << type;
|
| return;
|
| @@ -197,9 +190,6 @@ void GestureEventFilter::ProcessGestureAck(InputEventAckState ack_result,
|
| touchpad_tap_suppression_controller_->GestureFlingCancelAck(processed);
|
| }
|
| coalesced_gesture_events_.pop_front();
|
| - // If the event which was just ACKed was blocking events ignoring ack, fire
|
| - // those events now.
|
| - SendEventsIgnoringAck();
|
| if (ignore_next_ack_) {
|
| ignore_next_ack_ = false;
|
| } else if (!coalesced_gesture_events_.empty()) {
|
| @@ -362,25 +352,6 @@ gfx::Transform GestureEventFilter::GetTransformForEvent(
|
| return gesture_transform;
|
| }
|
|
|
| -void GestureEventFilter::SendEventsIgnoringAck() {
|
| - GestureEventWithLatencyInfo gesture_event;
|
| - while (!coalesced_gesture_events_.empty()) {
|
| - gesture_event = coalesced_gesture_events_.front();
|
| - if (!GestureEventFilter::ShouldIgnoreAckForGestureType(
|
| - gesture_event.event.type)) {
|
| - return;
|
| - }
|
| - coalesced_gesture_events_.pop_front();
|
| - client_->SendGestureEventImmediately(gesture_event);
|
| - }
|
| -}
|
| -
|
| -bool GestureEventFilter::ShouldIgnoreAckForGestureType(
|
| - WebInputEvent::Type type) {
|
| - return type == WebInputEvent::GestureTapDown ||
|
| - type == WebInputEvent::GestureShowPress;
|
| -}
|
| -
|
| void GestureEventFilter::EnqueueEvent(
|
| const GestureEventWithLatencyInfo& gesture_event) {
|
| coalesced_gesture_events_.push_back(gesture_event);
|
|
|