WebMouseEvent coordinates are now fractional & private

content/browser/pointer_lock_browsertest.cc

 // Copyright 2017 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/pointer_lock_browsertest.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 180 matching lines @@
 
   // Add a mouse move event listener to the root frame.
   EXPECT_TRUE(ExecuteScript(
       root,
       "var x; var y; var mX; var mY; document.addEventListener('mousemove', "
       "function(e) {x = e.x; y = e.y; mX = e.movementX; mY = e.movementY;});"));
 
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseMove,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
-  mouse_event.x = 10;
-  mouse_event.y = 11;
+  mouse_event.position.x = 10;
+  mouse_event.position.y = 11;
   mouse_event.movementX = 12;
   mouse_event.movementY = 13;
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   // Make sure that the renderer handled the input event.
   MainThreadFrameObserver root_observer(root_view->GetRenderWidgetHost());
   root_observer.Wait();
 
   int x, y, movementX, movementY;
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
@@ skipping 26 matching lines @@
   // Add a mouse move event listener to the child frame.
   EXPECT_TRUE(ExecuteScript(
       child,
       "var x; var y; var mX; var mY; document.addEventListener('mousemove', "
       "function(e) {x = e.x; y = e.y; mX = e.movementX; mY = e.movementY;});"));
 
   gfx::Point transformed_point;
   root_view->TransformPointToCoordSpaceForView(gfx::Point(0, 0), child_view,
                                                &transformed_point);
 
-  mouse_event.x = -transformed_point.x() + 14;
-  mouse_event.y = -transformed_point.y() + 15;
+  mouse_event.position.x = -transformed_point.x() + 14;
+  mouse_event.position.y = -transformed_point.y() + 15;
   mouse_event.movementX = 16;
   mouse_event.movementY = 17;
   // We use root_view intentionally as the RenderWidgetHostInputEventRouter is
   // responsible for correctly routing the event to the child frame.
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   // Make sure that the renderer handled the input event.
   MainThreadFrameObserver child_observer(child_view->GetRenderWidgetHost());
   child_observer.Wait();
 
@@ skipping 76 matching lines @@
   EXPECT_TRUE(ExecuteScript(
       root,
       "var x; var y; var mX; var mY; document.addEventListener('mousewheel', "
       "function(e) {x = e.x; y = e.y; dX = e.deltaX; dY = e.deltaY;});"));
   MainThreadFrameObserver root_observer(root_view->GetRenderWidgetHost());
   root_observer.Wait();
 
   blink::WebMouseWheelEvent wheel_event(
       blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
       blink::WebInputEvent::TimeStampForTesting);
-  wheel_event.x = 10;
-  wheel_event.y = 11;
+  wheel_event.position.x = 10;
+  wheel_event.position.y = 11;
   wheel_event.deltaX = -12;
   wheel_event.deltaY = -13;
   router->RouteMouseWheelEvent(root_view, &wheel_event, ui::LatencyInfo());
 
   // Make sure that the renderer handled the input event.
   root_observer.Wait();
 
   int x, y, deltaX, deltaY;
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       root, "window.domAutomationController.send(x);", &x));
@@ skipping 27 matching lines @@
       child,
       "var x; var y; var mX; var mY; document.addEventListener('mousewheel', "
       "function(e) {x = e.x; y = e.y; dX = e.deltaX; dY = e.deltaY;});"));
   MainThreadFrameObserver child_observer(child_view->GetRenderWidgetHost());
   child_observer.Wait();
 
   gfx::Point transformed_point;
   root_view->TransformPointToCoordSpaceForView(gfx::Point(0, 0), child_view,
                                                &transformed_point);
 
-  wheel_event.x = -transformed_point.x() + 14;
-  wheel_event.y = -transformed_point.y() + 15;
+  wheel_event.position.x = -transformed_point.x() + 14;
+  wheel_event.position.y = -transformed_point.y() + 15;
   wheel_event.deltaX = -16;
   wheel_event.deltaY = -17;
   // We use root_view intentionally as the RenderWidgetHostInputEventRouter is
   // responsible for correctly routing the event to the child frame.
   router->RouteMouseWheelEvent(root_view, &wheel_event, ui::LatencyInfo());
 
   // Make sure that the renderer handled the input event.
   child_observer.Wait();
 
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       child, "window.domAutomationController.send(x);", &x));
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       child, "window.domAutomationController.send(y);", &y));
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       child, "window.domAutomationController.send(dX);", &deltaX));
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       child, "window.domAutomationController.send(dY);", &deltaY));
   EXPECT_EQ(14, x);
   EXPECT_EQ(15, y);
   EXPECT_EQ(16, deltaX);
   EXPECT_EQ(17, deltaY);
 }
 
 }  // namespace content