WebMouseEvent coordinates are now fractional & private

content/browser/site_per_process_browsertest.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/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 151 matching lines @@
 }
 
 // Helper function to generate a click on the given RenderWidgetHost.  The
 // mouse event is forwarded directly to the RenderWidgetHost without any
 // hit-testing.
 void SimulateMouseClick(RenderWidgetHost* rwh, int x, int y) {
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   mouse_event.button = blink::WebPointerProperties::Button::Left;
-  mouse_event.x = x;
-  mouse_event.y = y;
+  mouse_event.position.x = x;
+  mouse_event.position.y = y;
   rwh->ForwardMouseEvent(mouse_event);
 }
 
 // Retrieve document.origin for the frame |ftn|.
 std::string GetDocumentOrigin(FrameTreeNode* ftn) {
   std::string origin;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       ftn, "domAutomationController.send(document.origin)", &origin));
   return origin;
 }
@@ skipping 120 matching lines @@
   // Get the view bounds of the child iframe, which should account for the
   // relative offset of its direct parent within the root frame, for use in
   // targeting the input event.
   gfx::Rect bounds = rwhv_child->GetViewBounds();
 
   // Target input event to child frame.
   blink::WebMouseEvent child_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   child_event.button = blink::WebPointerProperties::Button::Left;
-  child_event.x =
+  child_event.position.x =
       gfx::ToCeiledInt((bounds.x() - root_view->GetViewBounds().x()) /
                        scale_factor) +
       3;
-  child_event.y =
+  child_event.position.y =
       gfx::ToCeiledInt((bounds.y() - root_view->GetViewBounds().y()) /
                        scale_factor) +
       3;
   child_event.clickCount = 1;
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &child_event, ui::LatencyInfo());
 
   EXPECT_TRUE(child_frame_monitor.EventWasReceived());
   // The expected result coordinates are (3, 3), but can get slightly
   // different results due to rounding error with some device scale factors.
-  EXPECT_TRUE(child_frame_monitor.event().x <= 5 &&
-              child_frame_monitor.event().x >= 1)
-      << " actual event.x: " << child_frame_monitor.event().x;
-  EXPECT_TRUE(child_frame_monitor.event().y <= 5 &&
-              child_frame_monitor.event().y >= 1)
-      << " actual event.y: " << child_frame_monitor.event().y;
+  EXPECT_TRUE(child_frame_monitor.event().position.x <= 5 &&
+              child_frame_monitor.event().position.x >= 1)
+      << " actual event.position.x: " << child_frame_monitor.event().position.x;
+  EXPECT_TRUE(child_frame_monitor.event().position.y <= 5 &&
+              child_frame_monitor.event().position.y >= 1)
+      << " actual event.position.y: " << child_frame_monitor.event().position.y;
   EXPECT_FALSE(main_frame_monitor.EventWasReceived());
 
   child_frame_monitor.ResetEventReceived();
   main_frame_monitor.ResetEventReceived();
 
   // Target input event to main frame.
   blink::WebMouseEvent main_event(blink::WebInputEvent::MouseDown,
                                   blink::WebInputEvent::NoModifiers,
                                   blink::WebInputEvent::TimeStampForTesting);
   main_event.button = blink::WebPointerProperties::Button::Left;
-  main_event.x = 1;
-  main_event.y = 1;
+  main_event.position.x = 1;
+  main_event.position.y = 1;
   main_event.clickCount = 1;
   // Ladies and gentlemen, THIS is the main_event!
   router->RouteMouseEvent(root_view, &main_event, ui::LatencyInfo());
 
   EXPECT_FALSE(child_frame_monitor.EventWasReceived());
   EXPECT_TRUE(main_frame_monitor.EventWasReceived());
-  EXPECT_EQ(1, main_frame_monitor.event().x);
-  EXPECT_EQ(1, main_frame_monitor.event().y);
+  EXPECT_EQ(1, main_frame_monitor.event().position.x);
+  EXPECT_EQ(1, main_frame_monitor.event().position.y);
 }
 
 class RedirectNotificationObserver : public NotificationObserver {
  public:
   // Register to listen for notifications of the given type from either a
   // specific source, or from all sources if |source| is
   // NotificationService::AllSources().
   RedirectNotificationObserver(int notification_type,
                                const NotificationSource& source);
   ~RedirectNotificationObserver() override;
@@ skipping 702 matching lines @@
   scoped_refptr<FrameRectChangedMessageFilter> filter =
       new FrameRectChangedMessageFilter();
   root->current_frame_host()->GetProcess()->AddFilter(filter.get());
 
   // Scroll the parent frame downward to verify that the child rect gets updated
   // correctly.
   blink::WebMouseWheelEvent scroll_event(
       blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
       blink::WebInputEvent::TimeStampForTesting);
 
-  scroll_event.x = gfx::ToFlooredInt(
+  scroll_event.position.x = gfx::ToFlooredInt(
       (bounds.x() - rwhv_root->GetViewBounds().x() - 5) / scale_factor);
-  scroll_event.y = gfx::ToFlooredInt(
+  scroll_event.position.y = gfx::ToFlooredInt(
       (bounds.y() - rwhv_root->GetViewBounds().y() - 5) / scale_factor);
   scroll_event.deltaX = 0.0f;
   scroll_event.deltaY = -30.0f;
   rwhv_root->ProcessMouseWheelEvent(scroll_event, ui::LatencyInfo());
 
   filter->Wait();
 
   // The precise amount of scroll for the first view position update is not
   // deterministic, so this simply verifies that the OOPIF moved from its
   // earlier position.
@@ skipping 65 matching lines @@
   // Save the original offset as a point of reference.
   filter->Wait();
   gfx::Rect update_rect = filter->last_rect();
   int initial_y = update_rect.y();
   filter->Reset();
 
   // Scroll the parent frame downward.
   blink::WebMouseWheelEvent scroll_event(
       blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
       blink::WebInputEvent::TimeStampForTesting);
-  scroll_event.x = 1;
-  scroll_event.y = 1;
+  scroll_event.position.x = 1;
+  scroll_event.position.y = 1;
   scroll_event.deltaX = 0.0f;
   scroll_event.deltaY = -5.0f;
   rwhv_parent->ProcessMouseWheelEvent(scroll_event, ui::LatencyInfo());
 
   // Ensure that the view position is propagated to the child properly.
   filter->Wait();
   update_rect = filter->last_rect();
   EXPECT_LT(update_rect.y(), initial_y);
   filter->Reset();
 
@@ skipping 225 matching lines @@
   // Get the view bounds of the nested iframe, which should account for the
   // relative offset of its direct parent within the root frame, for use in
   // targeting the input event.
   gfx::Rect bounds = rwhv_nested->GetViewBounds();
 
   // Target input event to nested frame.
   blink::WebMouseEvent nested_event(blink::WebInputEvent::MouseDown,
                                     blink::WebInputEvent::NoModifiers,
                                     blink::WebInputEvent::TimeStampForTesting);
   nested_event.button = blink::WebPointerProperties::Button::Left;
-  nested_event.x =
+  nested_event.position.x =
       gfx::ToCeiledInt((bounds.x() - root_view->GetViewBounds().x()) /
                        scale_factor) +
       5;
-  nested_event.y =
+  nested_event.position.y =
       gfx::ToCeiledInt((bounds.y() - root_view->GetViewBounds().y()) /
                        scale_factor) +
       5;
   nested_event.clickCount = 1;
   nested_frame_monitor.ResetEventReceived();
   main_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &nested_event, ui::LatencyInfo());
 
   EXPECT_TRUE(nested_frame_monitor.EventWasReceived());
   // The expected result coordinates are (5, 5), but can get slightly
   // different results due to rounding error with some device scale factors.
-  EXPECT_TRUE(nested_frame_monitor.event().x <= 6 &&
-              nested_frame_monitor.event().x >= 4)
-      << " actual event.x: " << nested_frame_monitor.event().x;
-  EXPECT_TRUE(nested_frame_monitor.event().y <= 6 &&
-              nested_frame_monitor.event().y >= 4)
-      << " actual event.y: " << nested_frame_monitor.event().y;
+  EXPECT_TRUE(nested_frame_monitor.event().position.x <= 6 &&
+              nested_frame_monitor.event().position.x >= 4)
+      << " actual event.position.x: "
+      << nested_frame_monitor.event().position.x;
+  EXPECT_TRUE(nested_frame_monitor.event().position.y <= 6 &&
+              nested_frame_monitor.event().position.y >= 4)
+      << " actual event.position.y: "
+      << nested_frame_monitor.event().position.y;
   EXPECT_FALSE(main_frame_monitor.EventWasReceived());
 }
 
 // This test tests that browser process hittesting ignores frames with
 // pointer-events: none.
 #if defined(OS_ANDROID)
 // Test failing on some Android builders, due to inaccurate coordinates on
 // some devices. See: https://crbug.com/700007.
 #define MAYBE_SurfaceHitTestPointerEventsNone \
   DISABLED_SurfaceHitTestPointerEventsNone
@@ skipping 32 matching lines @@
 
   SurfaceHitTestReadyNotifier notifier(
       static_cast<RenderWidgetHostViewChildFrame*>(rwhv_child));
   notifier.WaitForSurfaceReady();
 
   // Target input event to child frame.
   blink::WebMouseEvent child_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   child_event.button = blink::WebPointerProperties::Button::Left;
-  child_event.x = 75;
-  child_event.y = 75;
+  child_event.position.x = 75;
+  child_event.position.y = 75;
   child_event.clickCount = 1;
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &child_event, ui::LatencyInfo());
 
   EXPECT_TRUE(main_frame_monitor.EventWasReceived());
-  EXPECT_EQ(75, main_frame_monitor.event().x);
-  EXPECT_EQ(75, main_frame_monitor.event().y);
+  EXPECT_EQ(75, main_frame_monitor.event().position.x);
+  EXPECT_EQ(75, main_frame_monitor.event().position.y);
   EXPECT_FALSE(child_frame_monitor.EventWasReceived());
 }
 
 // This test verifies that MouseEnter and MouseLeave events fire correctly
 // when the mouse cursor moves between processes.
 #if defined(OS_ANDROID)
 // Test failing on some Android builders, due to inaccurate coordinates on
 // some devices. See: https://crbug.com/700007.
 #define MAYBE_CrossProcessMouseEnterAndLeaveTest \
   DISABLED_CrossProcessMouseEnterAndLeaveTest
@@ skipping 69 matching lines @@
   gfx::Point point_in_b_frame(
       gfx::ToCeiledInt((b_bounds.x() - a_bounds.x()) / scale_factor) + 25,
       gfx::ToCeiledInt((b_bounds.y() - a_bounds.y()) / scale_factor) + 25);
   gfx::Point point_in_d_frame(
       gfx::ToCeiledInt((d_bounds.x() - a_bounds.x()) / scale_factor) + 25,
       gfx::ToCeiledInt((d_bounds.y() - a_bounds.y()) / scale_factor) + 25);
 
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseMove,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
-  mouse_event.x = point_in_a_frame.x();
-  mouse_event.y = point_in_a_frame.y();
+  mouse_event.position.x = point_in_a_frame.x();
+  mouse_event.position.y = point_in_a_frame.y();
 
   // Send an initial MouseMove to the root view, which shouldn't affect the
   // other renderers.
   web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event,
                                                          ui::LatencyInfo());
   EXPECT_TRUE(a_frame_monitor.EventWasReceived());
   a_frame_monitor.ResetEventReceived();
   EXPECT_FALSE(b_frame_monitor.EventWasReceived());
   EXPECT_FALSE(c_frame_monitor.EventWasReceived());
   EXPECT_FALSE(d_frame_monitor.EventWasReceived());
 
   // Next send a MouseMove to B frame, which shouldn't affect C or D but
   // A should receive a MouseMove event.
-  mouse_event.x = point_in_b_frame.x();
-  mouse_event.y = point_in_b_frame.y();
+  mouse_event.position.x = point_in_b_frame.x();
+  mouse_event.position.y = point_in_b_frame.y();
   web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event,
                                                          ui::LatencyInfo());
   EXPECT_TRUE(a_frame_monitor.EventWasReceived());
   EXPECT_EQ(a_frame_monitor.event().type(), blink::WebInputEvent::MouseMove);
   a_frame_monitor.ResetEventReceived();
   EXPECT_TRUE(b_frame_monitor.EventWasReceived());
   b_frame_monitor.ResetEventReceived();
   EXPECT_FALSE(c_frame_monitor.EventWasReceived());
   EXPECT_FALSE(d_frame_monitor.EventWasReceived());
 
   // Next send a MouseMove to D frame, which should have side effects in every
   // other RenderWidgetHostView.
-  mouse_event.x = point_in_d_frame.x();
-  mouse_event.y = point_in_d_frame.y();
+  mouse_event.position.x = point_in_d_frame.x();
+  mouse_event.position.y = point_in_d_frame.y();
   web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event,
                                                          ui::LatencyInfo());
   EXPECT_TRUE(a_frame_monitor.EventWasReceived());
   EXPECT_EQ(a_frame_monitor.event().type(), blink::WebInputEvent::MouseMove);
   EXPECT_TRUE(b_frame_monitor.EventWasReceived());
   EXPECT_EQ(b_frame_monitor.event().type(), blink::WebInputEvent::MouseLeave);
   EXPECT_TRUE(c_frame_monitor.EventWasReceived());
   EXPECT_EQ(c_frame_monitor.event().type(), blink::WebInputEvent::MouseMove);
   EXPECT_TRUE(d_frame_monitor.EventWasReceived());
 }
@@ skipping 55 matching lines @@
   int child_frame_target_y =
       gfx::ToCeiledInt((bounds.y() - root_view->GetViewBounds().y()) /
                        scale_factor) +
       5;
 
   // Target MouseDown to child frame.
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   mouse_event.button = blink::WebPointerProperties::Button::Left;
-  mouse_event.x = child_frame_target_x;
-  mouse_event.y = child_frame_target_y;
+  mouse_event.position.x = child_frame_target_x;
+  mouse_event.position.y = child_frame_target_y;
   mouse_event.clickCount = 1;
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   EXPECT_FALSE(main_frame_monitor.EventWasReceived());
   EXPECT_TRUE(child_frame_monitor.EventWasReceived());
 
   // Target MouseMove to main frame. This should still be routed to the
   // child frame because it is now capturing mouse input.
   mouse_event.setType(blink::WebInputEvent::MouseMove);
   mouse_event.setModifiers(blink::WebInputEvent::LeftButtonDown);
-  mouse_event.x = 1;
-  mouse_event.y = 1;
+  mouse_event.position.x = 1;
+  mouse_event.position.y = 1;
   // Note that this event is sent twice, with the monitors cleared after
   // the first time, because the first MouseMove to the child frame
   // causes a MouseMove to be sent to the main frame also, which we
   // need to ignore.
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
-  mouse_event.x = 1;
-  mouse_event.y = 2;
+  mouse_event.position.x = 1;
+  mouse_event.position.y = 2;
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   EXPECT_FALSE(main_frame_monitor.EventWasReceived());
   EXPECT_TRUE(child_frame_monitor.EventWasReceived());
 
   // A MouseUp to the child frame should cancel the mouse capture.
   mouse_event.setType(blink::WebInputEvent::MouseUp);
   mouse_event.setModifiers(blink::WebInputEvent::NoModifiers);
-  mouse_event.x = child_frame_target_x;
-  mouse_event.y = child_frame_target_y;
+  mouse_event.position.x = child_frame_target_x;
+  mouse_event.position.y = child_frame_target_y;
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   EXPECT_FALSE(main_frame_monitor.EventWasReceived());
   EXPECT_TRUE(child_frame_monitor.EventWasReceived());
 
   // Subsequent MouseMove events targeted to the main frame should be routed
   // to that frame.
   mouse_event.setType(blink::WebInputEvent::MouseMove);
-  mouse_event.x = 1;
-  mouse_event.y = 3;
+  mouse_event.position.x = 1;
+  mouse_event.position.y = 3;
   // Sending the MouseMove twice for the same reason as above.
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
-  mouse_event.x = 1;
-  mouse_event.y = 4;
+  mouse_event.position.x = 1;
+  mouse_event.position.y = 4;
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   EXPECT_TRUE(main_frame_monitor.EventWasReceived());
   EXPECT_FALSE(child_frame_monitor.EventWasReceived());
 
   // Target MouseDown to the main frame to cause it to capture input.
   mouse_event.setType(blink::WebInputEvent::MouseDown);
-  mouse_event.x = 1;
-  mouse_event.y = 1;
+  mouse_event.position.x = 1;
+  mouse_event.position.y = 1;
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   EXPECT_TRUE(main_frame_monitor.EventWasReceived());
   EXPECT_FALSE(child_frame_monitor.EventWasReceived());
 
   // Sending a MouseMove to the child frame should still result in the main
   // frame receiving the event.
   mouse_event.setType(blink::WebInputEvent::MouseMove);
   mouse_event.setModifiers(blink::WebInputEvent::LeftButtonDown);
-  mouse_event.x = child_frame_target_x;
-  mouse_event.y = child_frame_target_y;
+  mouse_event.position.x = child_frame_target_x;
+  mouse_event.position.y = child_frame_target_y;
   main_frame_monitor.ResetEventReceived();
   child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &mouse_event, ui::LatencyInfo());
 
   EXPECT_TRUE(main_frame_monitor.EventWasReceived());
   EXPECT_FALSE(child_frame_monitor.EventWasReceived());
 }
 
 // Tests OOPIF rendering by checking that the RWH of the iframe generates
 // OnSwapCompositorFrame message.
@@ skipping 3658 matching lines @@
             child_node->current_frame_host()->GetSiteInstance());
 
   scoped_refptr<CursorMessageFilter> filter = new CursorMessageFilter();
   child_node->current_frame_host()->GetProcess()->AddFilter(filter.get());
 
   // Send a MouseMove to the subframe. The frame contains text, and moving the
   // mouse over it should cause the renderer to send a mouse cursor update.
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseMove,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
-  mouse_event.x = 60;
-  mouse_event.y = 60;
+  mouse_event.position.x = 60;
+  mouse_event.position.y = 60;
   RenderWidgetHost* rwh_child =
       root->child_at(0)->current_frame_host()->GetRenderWidgetHost();
   RenderWidgetHostViewBase* root_view = static_cast<RenderWidgetHostViewBase*>(
       root->current_frame_host()->GetRenderWidgetHost()->GetView());
   web_contents()->GetInputEventRouter()->RouteMouseEvent(
       root_view, &mouse_event, ui::LatencyInfo());
 
   // CursorMessageFilter::Wait() implicitly tests whether we receive a
   // ViewHostMsg_SetCursor message from the renderer process, because it does
   // does not return otherwise.
@@ skipping 776 matching lines @@
 
   gfx::Point point(
       gfx::ToCeiledInt((bounds.x() - root_bounds.x()) / scale_factor) + 10,
       gfx::ToCeiledInt((bounds.y() - root_bounds.y()) / scale_factor) + 10);
 
   // Target right-click event to child frame.
   blink::WebMouseEvent click_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   click_event.button = blink::WebPointerProperties::Button::Right;
-  click_event.x = point.x();
-  click_event.y = point.y();
+  click_event.position.x = point.x();
+  click_event.position.y = point.y();
   click_event.clickCount = 1;
   router->RouteMouseEvent(root_view, &click_event, ui::LatencyInfo());
 
   // We also need a MouseUp event, needed by Windows.
   click_event.setType(blink::WebInputEvent::MouseUp);
-  click_event.x = point.x();
-  click_event.y = point.y();
+  click_event.position.x = point.x();
+  click_event.position.y = point.y();
   router->RouteMouseEvent(root_view, &click_event, ui::LatencyInfo());
 
   context_menu_delegate.Wait();
 
   ContextMenuParams params = context_menu_delegate.getParams();
 
   EXPECT_EQ(point.x(), params.x);
   EXPECT_EQ(point.y(), params.y);
 }
 
@@ skipping 125 matching lines @@
             child_node->current_frame_host()->GetSiteInstance());
 
   scoped_refptr<ShowWidgetMessageFilter> filter = new ShowWidgetMessageFilter();
   child_node->current_frame_host()->GetProcess()->AddFilter(filter.get());
 
   // Target left-click event to child frame.
   blink::WebMouseEvent click_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   click_event.button = blink::WebPointerProperties::Button::Left;
-  click_event.x = 15;
-  click_event.y = 15;
+  click_event.position.x = 15;
+  click_event.position.y = 15;
   click_event.clickCount = 1;
   rwhv_child->ProcessMouseEvent(click_event, ui::LatencyInfo());
 
   // Dismiss the popup.
-  click_event.x = 1;
-  click_event.y = 1;
+  click_event.position.x = 1;
+  click_event.position.y = 1;
   rwhv_child->ProcessMouseEvent(click_event, ui::LatencyInfo());
 
   filter->Wait();
   gfx::Rect popup_rect = filter->last_initial_rect();
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
   // On Mac and Android we receive the coordinates before they are transformed,
   // so they are still relative to the out-of-process iframe origin.
   EXPECT_EQ(popup_rect.x(), 9);
   EXPECT_EQ(popup_rect.y(), 9);
 #else
   EXPECT_EQ(popup_rect.x() - rwhv_root->GetViewBounds().x(), 354);
   EXPECT_EQ(popup_rect.y() - rwhv_root->GetViewBounds().y(), 94);
 #endif
 
 #if defined(OS_LINUX)
   // Verify click-and-drag selection of popups still works on Linux with
   // OOPIFs enabled. This is only necessary to test on Aura because Mac and
   // Android use native widgets. Windows does not support this as UI
   // convention (it requires separate clicks to open the menu and select an
   // option). See https://crbug.com/703191.
   int process_id = child_node->current_frame_host()->GetProcess()->GetID();
   filter->Reset();
   RenderWidgetHostInputEventRouter* router =
       static_cast<WebContentsImpl*>(shell()->web_contents())
           ->GetInputEventRouter();
   // Re-open the select element.
-  click_event.x = 360;
-  click_event.y = 90;
+  click_event.position.x = 360;
+  click_event.position.y = 90;
   click_event.clickCount = 1;
   router->RouteMouseEvent(rwhv_root, &click_event, ui::LatencyInfo());
 
   filter->Wait();
 
   RenderWidgetHostView* popup_view =
       RenderWidgetHost::FromID(process_id, filter->last_routing_id())
           ->GetView();
 
   RenderWidgetHostMouseEventMonitor popup_monitor(
@@ skipping 61 matching lines @@
             c_node->current_frame_host()->GetSiteInstance());
 
   scoped_refptr<ShowWidgetMessageFilter> filter = new ShowWidgetMessageFilter();
   c_node->current_frame_host()->GetProcess()->AddFilter(filter.get());
 
   // Target left-click event to child frame.
   blink::WebMouseEvent click_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   click_event.button = blink::WebPointerProperties::Button::Left;
-  click_event.x = 15;
-  click_event.y = 15;
+  click_event.position.x = 15;
+  click_event.position.y = 15;
   click_event.clickCount = 1;
   rwhv_c_node->ProcessMouseEvent(click_event, ui::LatencyInfo());
 
   // Prompt the WebContents to dismiss the popup by clicking elsewhere.
-  click_event.x = 1;
-  click_event.y = 1;
+  click_event.position.x = 1;
+  click_event.position.y = 1;
   rwhv_c_node->ProcessMouseEvent(click_event, ui::LatencyInfo());
 
   filter->Wait();
 
   gfx::Rect popup_rect = filter->last_initial_rect();
 
 #if defined(OS_MACOSX)
   EXPECT_EQ(popup_rect.x(), 9);
   EXPECT_EQ(popup_rect.y(), 9);
 #else
@@ skipping 22 matching lines @@
              b_node->current_frame_host()->GetView()->GetViewBounds().x() &&
          last_b_node_bounds_rect.y() ==
              b_node->current_frame_host()->GetView()->GetViewBounds().y()) {
     base::RunLoop run_loop;
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, run_loop.QuitClosure(), TestTimeouts::tiny_timeout());
     run_loop.Run();
   }
 
   click_event.button = blink::WebPointerProperties::Button::Left;
-  click_event.x = 15;
-  click_event.y = 15;
+  click_event.position.x = 15;
+  click_event.position.y = 15;
   click_event.clickCount = 1;
   rwhv_c_node->ProcessMouseEvent(click_event, ui::LatencyInfo());
 
-  click_event.x = 1;
-  click_event.y = 1;
+  click_event.position.x = 1;
+  click_event.position.y = 1;
   rwhv_c_node->ProcessMouseEvent(click_event, ui::LatencyInfo());
 
   filter->Wait();
 
   popup_rect = filter->last_initial_rect();
 
 #if defined(OS_MACOSX)
   EXPECT_EQ(popup_rect.x(), 9);
   EXPECT_EQ(popup_rect.y(), 9);
 #else
@@ skipping 2814 matching lines @@
           ->GetInputEventRouter();
 
   // Create listener for input events.
   RenderWidgetHostMouseEventMonitor event_monitor(
       root->current_frame_host()->GetRenderWidgetHost());
 
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   mouse_event.button = blink::WebPointerProperties::Button::Left;
-  mouse_event.x = 75;
-  mouse_event.y = 75;
+  mouse_event.position.x = 75;
+  mouse_event.position.y = 75;
   mouse_event.clickCount = 1;
   event_monitor.ResetEventReceived();
   router->RouteMouseEvent(rwhv, &mouse_event, ui::LatencyInfo());
 
   EXPECT_TRUE(event_monitor.EventWasReceived());
-  gfx::Point mouse_down_coords =
-      gfx::Point(event_monitor.event().x, event_monitor.event().y);
+  gfx::Point mouse_down_coords = gfx::Point(event_monitor.event().position.x,
+                                            event_monitor.event().position.y);
   event_monitor.ResetEventReceived();
 
   mouse_event.setType(blink::WebInputEvent::MouseUp);
-  mouse_event.x = 75;
-  mouse_event.y = 75;
+  mouse_event.position.x = 75;
+  mouse_event.position.y = 75;
   router->RouteMouseEvent(rwhv, &mouse_event, ui::LatencyInfo());
 
   EXPECT_TRUE(event_monitor.EventWasReceived());
-  EXPECT_EQ(mouse_down_coords,
-            gfx::Point(event_monitor.event().x, event_monitor.event().y));
+  EXPECT_EQ(mouse_down_coords, gfx::Point(event_monitor.event().position.x,
+                                          event_monitor.event().position.y));
 }
 
 // This tests that we don't hide the RenderViewHost when reusing the
 // RenderViewHost for a subframe. See https://crbug.com/638375.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ReusedRenderViewNotHidden) {
   GURL a_url(embedded_test_server()->GetURL("a.com", "/title1.html"));
   GURL b_url_a_subframe(embedded_test_server()->GetURL(
       "b.com", "/cross_site_iframe_factory.html?b(a)"));
 
   EXPECT_TRUE(NavigateToURL(shell(), a_url));
@@ skipping 561 matching lines @@
     names.insert(root->children[0]->frame_entry->frame_unique_name());
   }
 
   // More than one entry in the set means that the subframe frame navigation
   // entries didn't have a consistent unique name. This will break history
   // navigations =(
   EXPECT_THAT(names, SizeIs(1)) << "Mismatched names for subframe!";
 }
 
 }  // namespace content