Fix x/y position of gesture scroll events.

content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.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 <stddef.h>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 107 matching lines @@
   static void RunTasksAndWait(base::TimeDelta delay) {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), delay);
     base::MessageLoop::current()->Run();
   }
 
   void GestureSendingTest(bool high_precision) {
     const WebGestureEvent::ScrollUnits scroll_units =
         high_precision ? WebGestureEvent::PrecisePixels
                        : WebGestureEvent::Pixels;
-    SendMouseWheel(10, 10, 1, 1, 0, high_precision);
+    SendMouseWheel(10, 12, 1, 1, 0, high_precision);
     EXPECT_EQ(0U, queued_event_count());
     EXPECT_TRUE(event_in_flight());
     EXPECT_EQ(1U, GetAndResetSentEventCount());
 
     // The second mouse wheel should not be sent since one is already in queue.
-    SendMouseWheel(10, 10, 5, 5, 0, high_precision);
+    SendMouseWheel(10, 12, 5, 5, 0, high_precision);
     EXPECT_EQ(1U, queued_event_count());
     EXPECT_TRUE(event_in_flight());
     EXPECT_EQ(0U, GetAndResetSentEventCount());
 
     // Receive an ACK for the mouse wheel event and release the next
     // mouse wheel event.
     SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
     EXPECT_EQ(0U, queued_event_count());
     EXPECT_TRUE(event_in_flight());
     EXPECT_EQ(WebInputEvent::MouseWheel, acked_event().type);
     EXPECT_EQ(1U, GetAndResetAckedEventCount());
     EXPECT_EQ(3U, all_sent_events().size());
     EXPECT_EQ(WebInputEvent::GestureScrollBegin, all_sent_events()[0].type);
     EXPECT_EQ(scroll_units,
               sent_gesture_events()[0].data.scrollBegin.deltaHintUnits);
+    EXPECT_EQ(10, sent_gesture_events()[0].x);
+    EXPECT_EQ(12, sent_gesture_events()[0].y);

[tdresser, 2016/02/22 19:58:48]

Let's check globalX/globalY somewhere at least.

[dtapuska, 2016/02/22 20:28:46]

Done.

     EXPECT_EQ(WebInputEvent::GestureScrollUpdate, all_sent_events()[1].type);
     EXPECT_EQ(scroll_units,
               sent_gesture_events()[1].data.scrollUpdate.deltaUnits);
+    EXPECT_EQ(10, sent_gesture_events()[1].x);
+    EXPECT_EQ(12, sent_gesture_events()[1].y);
     EXPECT_EQ(WebInputEvent::MouseWheel, all_sent_events()[2].type);
     EXPECT_EQ(3U, GetAndResetSentEventCount());
 
     RunTasksAndWait(DefaultScrollEndTimeoutDelay() * 2);
     EXPECT_EQ(1U, all_sent_events().size());
     EXPECT_EQ(WebInputEvent::GestureScrollEnd, all_sent_events()[0].type);
     EXPECT_EQ(scroll_units, sent_gesture_events()[0].data.scrollEnd.deltaUnits);
+    EXPECT_EQ(10, sent_gesture_events()[0].x);
+    EXPECT_EQ(12, sent_gesture_events()[0].y);
   }
 
   scoped_ptr<MouseWheelEventQueue> queue_;
   std::vector<WebInputEvent> sent_events_;
   std::vector<WebGestureEvent> sent_gesture_events_;
   size_t acked_event_count_;
   InputEventAckState last_acked_event_state_;
   base::MessageLoopForUI message_loop_;
   WebMouseWheelEvent last_acked_event_;
 };
@@ skipping 90 matching lines @@
   EXPECT_FALSE(event_in_flight());
   EXPECT_EQ(WebInputEvent::MouseWheel, acked_event().type);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
   EXPECT_EQ(2U, all_sent_events().size());
   EXPECT_EQ(WebInputEvent::GestureScrollBegin, all_sent_events()[0].type);
   EXPECT_EQ(WebInputEvent::GestureScrollUpdate, all_sent_events()[1].type);
   EXPECT_EQ(2U, GetAndResetSentEventCount());
 }
 
 }  // namespace content