| 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 8639043edd6766a4f1f377cc371ac6d16a1a19c3..b6c766b31e123f1953ac3f5c179d8ed93f3a4967 100644
|
| --- a/content/browser/renderer_host/input/gesture_event_filter.cc
|
| +++ b/content/browser/renderer_host/input/gesture_event_filter.cc
|
| @@ -373,14 +373,8 @@ void GestureEventFilter::MergeOrInsertScrollAndPinchEvent(
|
| return;
|
| }
|
| GestureEventWithLatencyInfo* last_event = &coalesced_gesture_events_.back();
|
| - if (gesture_event.event.type == WebInputEvent::GestureScrollUpdate &&
|
| - last_event->event.type == WebInputEvent::GestureScrollUpdate &&
|
| - last_event->event.modifiers == gesture_event.event.modifiers) {
|
| - last_event->event.data.scrollUpdate.deltaX +=
|
| - gesture_event.event.data.scrollUpdate.deltaX;
|
| - last_event->event.data.scrollUpdate.deltaY +=
|
| - gesture_event.event.data.scrollUpdate.deltaY;
|
| - last_event->latency.MergeWith(gesture_event.latency);
|
| + if (last_event->CanCoalesceWith(gesture_event)) {
|
| + last_event->CoalesceWith(gesture_event);
|
| return;
|
| }
|
| if (coalesced_gesture_events_.size() == 2 ||
|
|
|