WebMouseEvent coordinates are now fractional & private

third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

 // Copyright 2014 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 "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 1108 matching lines @@
 TEST_P(VisualViewportTest, TestContextMenuShownInCorrectLocation) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(200, 300));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   WebMouseEvent mouseDownEvent(WebInputEvent::MouseDown,
                                WebInputEvent::NoModifiers,
                                WebInputEvent::TimeStampForTesting);
-  mouseDownEvent.x = 10;
-  mouseDownEvent.y = 10;
-  mouseDownEvent.globalX = 110;
-  mouseDownEvent.globalY = 210;
+  mouseDownEvent.position.x = 10;
+  mouseDownEvent.position.y = 10;
+  mouseDownEvent.screenPosition.x = 110;
+  mouseDownEvent.screenPosition.y = 210;
   mouseDownEvent.clickCount = 1;
   mouseDownEvent.button = WebMouseEvent::Button::Right;
 
   // Corresponding release event (Windows shows context menu on release).
   WebMouseEvent mouseUpEvent(mouseDownEvent);
   mouseUpEvent.setType(WebInputEvent::MouseUp);
 
   WebFrameClient* oldClient = webViewImpl()->mainFrameImpl()->client();
   MockWebFrameClient mockWebFrameClient;
-  EXPECT_CALL(mockWebFrameClient, showContextMenu(ContextMenuAtLocation(
-                                      mouseDownEvent.x, mouseDownEvent.y)));
+  EXPECT_CALL(mockWebFrameClient,
+              showContextMenu(ContextMenuAtLocation(
+                  mouseDownEvent.position.x, mouseDownEvent.position.y)));
 
   // Do a sanity check with no scale applied.
   webViewImpl()->mainFrameImpl()->setClient(&mockWebFrameClient);
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseDownEvent));
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseUpEvent));
 
   Mock::VerifyAndClearExpectations(&mockWebFrameClient);
   mouseDownEvent.button = WebMouseEvent::Button::Left;
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseDownEvent));
 
   // Now pinch zoom into the page and move the visual viewport. The context menu
   // should still appear at the location of the event, relative to the WebView.
   VisualViewport& visualViewport = frame()->page()->visualViewport();
   webViewImpl()->setPageScaleFactor(2);
   EXPECT_CALL(mockWebFrameClient, didChangeScrollOffset(_));
   visualViewport.setLocation(FloatPoint(60, 80));
-  EXPECT_CALL(mockWebFrameClient, showContextMenu(ContextMenuAtLocation(
-                                      mouseDownEvent.x, mouseDownEvent.y)));
+  EXPECT_CALL(mockWebFrameClient,
+              showContextMenu(ContextMenuAtLocation(
+                  mouseDownEvent.position.x, mouseDownEvent.position.y)));
 
   mouseDownEvent.button = WebMouseEvent::Button::Right;
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseDownEvent));
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseUpEvent));
 
   // Reset the old client so destruction can occur naturally.
   webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 // Test that the client is notified if page scroll events.
@@ skipping 1258 matching lines @@
                                    "  body {"
                                    "    margin: 0px;"
                                    "  }"
                                    "  div { height:110vh; width: 110vw; }"
                                    "</style>"
                                    "<div></div>",
                                    baseURL);
 }
 
 }  // namespace