Use new gesture event fields in more places

content/browser/renderer_host/gesture_event_filter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/gesture_event_filter.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/tap_suppression_controller.h"
@@ skipping 152 matching lines @@
   }
 }
 
 void GestureEventFilter::MergeOrInsertScrollEvent(
     const WebGestureEvent& gesture_event) {
   WebGestureEvent* last_gesture_event = coalesced_gesture_events_.empty() ? 0 :
       &coalesced_gesture_events_.back();
   if (coalesced_gesture_events_.size() > 1 &&
       last_gesture_event->type == gesture_event.type &&
       last_gesture_event->modifiers == gesture_event.modifiers) {
+    last_gesture_event->data.scrollUpdate.deltaX +=
+        gesture_event.data.scrollUpdate.deltaX;
+    last_gesture_event->data.scrollUpdate.deltaY +=
+        gesture_event.data.scrollUpdate.deltaY;
+    // TODO(rbyers): deltaX/deltaY fields going away. crbug.com/143237
     last_gesture_event->deltaX += gesture_event.deltaX;
     last_gesture_event->deltaY += gesture_event.deltaY;
     DLOG_IF(WARNING,
             gesture_event.timeStampSeconds <=
             last_gesture_event->timeStampSeconds)
             << "Event time not monotonic?\n";
     DCHECK(last_gesture_event->type == WebInputEvent::GestureScrollUpdate);
     last_gesture_event->timeStampSeconds = gesture_event.timeStampSeconds;
   } else {
     coalesced_gesture_events_.push_back(gesture_event);
   }
 }
 
 } // namespace content