Fix x/y position of gesture scroll events.

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 67 matching lines @@
 
   event_sent_for_gesture_ack_->latency.AddNewLatencyFrom(latency_info);
   client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result);
 
   // If event wasn't consumed then generate a gesture scroll for it.
   if (send_gestures_ && ack_result != INPUT_EVENT_ACK_STATE_CONSUMED &&
       event_sent_for_gesture_ack_->event.canScroll &&
       (scrolling_device_ == blink::WebGestureDeviceUninitialized ||
        scrolling_device_ == blink::WebGestureDeviceTouchpad)) {
     GestureEventWithLatencyInfo scroll_update;
+    scroll_update.event.x = event_sent_for_gesture_ack_->event.x;
+    scroll_update.event.y = event_sent_for_gesture_ack_->event.y;
+    scroll_update.event.globalX = event_sent_for_gesture_ack_->event.globalX;
+    scroll_update.event.globalY = event_sent_for_gesture_ack_->event.globalY;
     scroll_update.event.type = WebInputEvent::GestureScrollUpdate;
     scroll_update.event.sourceDevice = blink::WebGestureDeviceTouchpad;
     scroll_update.event.resendingPluginId = -1;
     scroll_update.event.data.scrollUpdate.deltaX =
         event_sent_for_gesture_ack_->event.deltaX;
     scroll_update.event.data.scrollUpdate.deltaY =
         event_sent_for_gesture_ack_->event.deltaY;
     if (event_sent_for_gesture_ack_->event.scrollByPage) {
       scroll_update.event.data.scrollUpdate.deltaUnits =
           blink::WebGestureEvent::Page;
@@ skipping 49 matching lines @@
   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(
-    blink::WebGestureEvent::ScrollUnits units) {
+void MouseWheelEventQueue::SendScrollEnd(blink::WebGestureEvent update_event) {
   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;
+  scroll_end.event.data.scrollEnd.deltaUnits =
+      update_event.data.scrollUpdate.deltaUnits;
+  scroll_end.event.x = update_event.x;
+  scroll_end.event.y = update_event.y;
+  scroll_end.event.globalX = update_event.globalX;
+  scroll_end.event.globalY = update_event.globalY;
+
   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.x = gesture.event.x;
+        scroll_begin.event.y = gesture.event.y;
+        scroll_begin.event.globalX = gesture.event.globalX;
+        scroll_begin.event.globalY = gesture.event.globalY;
         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_),
             base::Bind(&MouseWheelEventQueue::SendScrollEnd,
-                       base::Unretained(this),
-                       gesture.event.data.scrollUpdate.deltaUnits));
+                       base::Unretained(this), gesture.event));
       }
       break;
     case WebInputEvent::GestureScrollEnd:
       needs_scroll_begin_ = true;
       break;
     case WebInputEvent::GestureScrollBegin:
       needs_scroll_begin_ = false;
       break;
     default:
       return;
   }
   client_->SendGestureEvent(gesture);
 }
 
 }  // namespace content