Consolidate WebInputEvent coalescing logic

content/browser/renderer_host/input/gesture_event_filter.cc

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 a3b15a7cdc67c8dacea38b6f524dff23e6b66f9c..c2f37fbd6bbcac27b4d1bd6616149400dd05b76d 100644
--- a/content/browser/renderer_host/input/gesture_event_filter.cc
+++ b/content/browser/renderer_host/input/gesture_event_filter.cc
@@ -370,16 +370,10 @@ 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->TryCoalesceWith(gesture_event)) {

[aelias_OOO_until_Jul13, 2013/10/14 03:38:57]

nit: no {}

[jdduke (slow), 2013/10/14 17:03:18]

Done.

     return;
   }
+
   if (coalesced_gesture_events_.size() == 2 ||
       (coalesced_gesture_events_.size() == 3 && ignore_next_ack_) ||
       !ShouldTryMerging(gesture_event, *last_event)) {