| Index: content/browser/renderer_host/input/gesture_event_queue.cc
|
| diff --git a/content/browser/renderer_host/input/gesture_event_queue.cc b/content/browser/renderer_host/input/gesture_event_queue.cc
|
| index 9811e7357e1782e91bb64ff82a8b7f48fb0cb9dd..314d04feaeb2d94f5c669132ba87cd3e40baa329 100644
|
| --- a/content/browser/renderer_host/input/gesture_event_queue.cc
|
| +++ b/content/browser/renderer_host/input/gesture_event_queue.cc
|
| @@ -93,19 +93,10 @@ bool GestureEventQueue::ShouldForwardForBounceReduction(
|
| bool GestureEventQueue::ShouldForward(
|
| const GestureEventWithLatencyInfo& gesture_event) {
|
| TRACE_EVENT0("input", "GestureEventQueue::ShouldForward");
|
| - return ShouldForwardForZeroVelocityFlingStart(gesture_event) &&
|
| - ShouldForwardForBounceReduction(gesture_event) &&
|
| - ShouldForwardForGFCFiltering(gesture_event) &&
|
| - ShouldForwardForTapSuppression(gesture_event) &&
|
| - ShouldForwardForCoalescing(gesture_event);
|
| -}
|
| -
|
| -bool GestureEventQueue::ShouldForwardForZeroVelocityFlingStart(
|
| - const GestureEventWithLatencyInfo& gesture_event) const {
|
| - return gesture_event.event.type != WebInputEvent::GestureFlingStart ||
|
| - gesture_event.event.sourceDevice != WebGestureEvent::Touchpad ||
|
| - gesture_event.event.data.flingStart.velocityX != 0 ||
|
| - gesture_event.event.data.flingStart.velocityY != 0;
|
| + return ShouldForwardForBounceReduction(gesture_event) &&
|
| + ShouldForwardForGFCFiltering(gesture_event) &&
|
| + ShouldForwardForTapSuppression(gesture_event) &&
|
| + ShouldForwardForCoalescing(gesture_event);
|
| }
|
|
|
| bool GestureEventQueue::ShouldForwardForGFCFiltering(
|
|
|