| 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 a0a80e382ce04fa2dd27c4e8f0213f6f0fecaa16..07e4e7d05fe208681fa8848b846e45650e6c46d6 100644
|
| --- a/content/browser/renderer_host/input/gesture_event_queue.cc
|
| +++ b/content/browser/renderer_host/input/gesture_event_queue.cc
|
| @@ -87,7 +87,6 @@ void GestureEventQueue::QueueEvent(
|
| !ShouldForwardForTapSuppression(gesture_event)) {
|
| return;
|
| }
|
| -
|
| QueueAndForwardIfNecessary(gesture_event);
|
| }
|
|
|
| @@ -306,10 +305,15 @@ void GestureEventQueue::SendScrollEndingEventsNow() {
|
| return;
|
| GestureQueue debouncing_deferral_queue;
|
| debouncing_deferral_queue.swap(debouncing_deferral_queue_);
|
| - for (GestureQueue::const_iterator it = debouncing_deferral_queue.begin();
|
| + for (GestureQueue::iterator it = debouncing_deferral_queue.begin();
|
| it != debouncing_deferral_queue.end(); it++) {
|
| if (ShouldForwardForGFCFiltering(*it) &&
|
| ShouldForwardForTapSuppression(*it)) {
|
| + if (it->event.type == WebInputEvent::GestureScrollEnd &&
|
| + it < debouncing_deferral_queue.end() - 1 &&
|
| + (it + 1)->event.type == WebInputEvent::GestureFlingStart) {
|
| + it->event.data.scrollEnd.flingMightHappenNext = true;
|
| + }
|
| QueueAndForwardIfNecessary(*it);
|
| }
|
| }
|
|
|