Add scrollDelta units to GestureScrollEnd.

content/browser/renderer_host/input/mouse_wheel_event_queue.cc

 // Copyright 2016 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/input/mouse_wheel_event_queue.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 
@@ skipping 106 matching lines @@
   TryForwardNextEventToRenderer();
 }
 
 void MouseWheelEventQueue::OnGestureScrollEvent(
     const GestureEventWithLatencyInfo& gesture_event) {
   if (gesture_event.event.type == blink::WebInputEvent::GestureScrollBegin) {
     // If there is a current scroll going on and a new scroll that isn't
     // wheel based cancel current one by sending a ScrollEnd.
     if (scroll_end_timer_.IsRunning() &&
         gesture_event.event.sourceDevice != blink::WebGestureDeviceTouchpad) {
+      base::Closure task = scroll_end_timer_.user_task();
       scroll_end_timer_.Reset();
-      SendScrollEnd();
+      task.Run();
     }
     scrolling_device_ = gesture_event.event.sourceDevice;
   } else if (scrolling_device_ == gesture_event.event.sourceDevice &&
              (gesture_event.event.type ==
                   blink::WebInputEvent::GestureScrollEnd ||
               gesture_event.event.type ==
                   blink::WebInputEvent::GestureFlingStart)) {
     scrolling_device_ = blink::WebGestureDeviceUninitialized;
   }
 }
 
 void MouseWheelEventQueue::TryForwardNextEventToRenderer() {
   TRACE_EVENT0("input", "MouseWheelEventQueue::TryForwardNextEventToRenderer");
 
   if (wheel_queue_.empty() || event_sent_for_gesture_ack_)
     return;
 
   event_sent_for_gesture_ack_.reset(wheel_queue_.front());
   wheel_queue_.pop_front();
 
   MouseWheelEventWithLatencyInfo send_event(*event_sent_for_gesture_ack_);
   if (send_gestures_)
     send_event.event.canScroll = false;
 
   client_->SendMouseWheelEventImmediately(send_event);
 }
 
-void MouseWheelEventQueue::SendScrollEnd() {
+void MouseWheelEventQueue::SendScrollEnd(
+    blink::WebGestureEvent::ScrollUnits units) {
   GestureEventWithLatencyInfo scroll_end;
   scroll_end.event.type = WebInputEvent::GestureScrollEnd;
   scroll_end.event.sourceDevice = blink::WebGestureDeviceTouchpad;
   scroll_end.event.resendingPluginId = -1;
+  scroll_end.event.data.scrollEnd.deltaUnits = units;
   SendGesture(scroll_end);
 }
 
 void MouseWheelEventQueue::SendGesture(
     const GestureEventWithLatencyInfo& gesture) {
   switch (gesture.event.type) {
     case WebInputEvent::GestureScrollUpdate:
       if (needs_scroll_begin_) {
         GestureEventWithLatencyInfo scroll_begin(gesture);
         scroll_begin.event.type = WebInputEvent::GestureScrollBegin;
         scroll_begin.event.data.scrollBegin.deltaXHint =
             gesture.event.data.scrollUpdate.deltaX;
         scroll_begin.event.data.scrollBegin.deltaYHint =
             gesture.event.data.scrollUpdate.deltaY;
         scroll_begin.event.data.scrollBegin.targetViewport = false;
         scroll_begin.event.data.scrollBegin.deltaHintUnits =
             gesture.event.data.scrollUpdate.deltaUnits;
 
         SendGesture(scroll_begin);
       }
       if (scroll_end_timer_.IsRunning()) {
         scroll_end_timer_.Reset();
       } else {
-        scroll_end_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(
-                                               scroll_transaction_ms_),
-                                this, &MouseWheelEventQueue::SendScrollEnd);
+        scroll_end_timer_.Start(
+            FROM_HERE,
+            base::TimeDelta::FromMilliseconds(scroll_transaction_ms_),
+            base::Bind(&MouseWheelEventQueue::SendScrollEnd,
+                       base::Unretained(this),
+                       gesture.event.data.scrollUpdate.deltaUnits));
       }
       break;
     case WebInputEvent::GestureScrollEnd:
       needs_scroll_begin_ = true;
       break;
     case WebInputEvent::GestureScrollBegin:
       needs_scroll_begin_ = false;
       break;
     default:
       return;
   }
   client_->SendGestureEvent(gesture);
 }
 
 }  // namespace content