WebMouseEvent coordinates are now fractional & private

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 117 matching lines @@
   webViewImpl->updateAllLifecyclePhases();
 
   webViewImpl->setPageScaleFactor(2);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
-    webMouseEvent.x = 10;
-    webMouseEvent.y = 10;
-    webMouseEvent.globalX = 10;
-    webMouseEvent.globalY = 10;
+    webMouseEvent.setPositionInWidget(10, 10);
+    webMouseEvent.setPositionInScreen(10, 10);
     webMouseEvent.movementX = 10;
     webMouseEvent.movementY = 10;
 
     WebMouseEvent transformedEvent =
         TransformWebMouseEvent(view, webMouseEvent);
     IntPoint position = flooredIntPoint(transformedEvent.positionInRootFrame());
     EXPECT_EQ(5, position.x());
     EXPECT_EQ(5, position.y());
-    EXPECT_EQ(10, transformedEvent.globalX);
-    EXPECT_EQ(10, transformedEvent.globalY);
+    EXPECT_EQ(10, transformedEvent.positionInScreen().x);
+    EXPECT_EQ(10, transformedEvent.positionInScreen().y);
 
     IntPoint movement = flooredIntPoint(transformedEvent.movementInRootFrame());
     EXPECT_EQ(5, movement.x());
     EXPECT_EQ(5, movement.y());
   }
 
   {
     WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollUpdate,
                                     WebInputEvent::NoModifiers,
                                     WebInputEvent::TimeStampForTesting);
@@ skipping 196 matching lines @@
   webViewImpl->setPageScaleFactor(2);
   webViewImpl->mainFrameImpl()->setInputEventsTransformForEmulation(
       IntSize(10, 20), 1.5);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
-    webMouseEvent.x = 100;
-    webMouseEvent.y = 110;
-    webMouseEvent.globalX = 100;
-    webMouseEvent.globalY = 110;
+    webMouseEvent.setPositionInWidget(100, 110);
+    webMouseEvent.setPositionInScreen(100, 110);
     webMouseEvent.movementX = 60;
     webMouseEvent.movementY = 60;
 
     WebMouseEvent transformedEvent =
         TransformWebMouseEvent(view, webMouseEvent);
     FloatPoint position = transformedEvent.positionInRootFrame();
 
     EXPECT_FLOAT_EQ(30, position.x());
     EXPECT_FLOAT_EQ(30, position.y());
-    EXPECT_EQ(100, transformedEvent.globalX);
-    EXPECT_EQ(110, transformedEvent.globalY);
+    EXPECT_EQ(100, transformedEvent.positionInScreen().x);
+    EXPECT_EQ(110, transformedEvent.positionInScreen().y);
 
     IntPoint movement = flooredIntPoint(transformedEvent.movementInRootFrame());
     EXPECT_EQ(20, movement.x());
     EXPECT_EQ(20, movement.y());
   }
 
   {
     WebMouseEvent webMouseEvent1(WebInputEvent::MouseMove,
                                  WebInputEvent::NoModifiers,
                                  WebInputEvent::TimeStampForTesting);
-    webMouseEvent1.x = 100;
-    webMouseEvent1.y = 110;
-    webMouseEvent1.globalX = 100;
-    webMouseEvent1.globalY = 110;
+    webMouseEvent1.setPositionInWidget(100, 110);
+    webMouseEvent1.setPositionInScreen(100, 110);
     webMouseEvent1.movementX = 60;
     webMouseEvent1.movementY = 60;
 
     WebMouseEvent webMouseEvent2 = webMouseEvent1;
-    webMouseEvent2.y = 140;
-    webMouseEvent2.globalY = 140;
+    webMouseEvent2.setPositionInWidget(0, 140);

[dtapuska, 2017/03/31 14:04:18]

This looks wrong. Only the y is getting adjusted.. probably should have x from
the other event.

[mustaq, 2017/03/31 15:50:32]

Done.

+    webMouseEvent2.setPositionInScreen(0, 140);
     webMouseEvent2.movementY = 30;
 
     std::vector<const WebInputEvent*> events;
     events.push_back(&webMouseEvent1);
     events.push_back(&webMouseEvent2);
 
     Vector<WebMouseEvent> coalescedevents =
         TransformWebMouseEventVector(view, events);
     EXPECT_EQ(events.size(), coalescedevents.size());
 
     FloatPoint position = coalescedevents[0].positionInRootFrame();
     EXPECT_FLOAT_EQ(30, position.x());
     EXPECT_FLOAT_EQ(30, position.y());
-    EXPECT_EQ(100, coalescedevents[0].globalX);
-    EXPECT_EQ(110, coalescedevents[0].globalY);
+    EXPECT_EQ(100, coalescedevents[0].positionInScreen().x);
+    EXPECT_EQ(110, coalescedevents[0].positionInScreen().y);
 
     IntPoint movement =
         flooredIntPoint(coalescedevents[0].movementInRootFrame());
     EXPECT_EQ(20, movement.x());
     EXPECT_EQ(20, movement.y());
 
     position = coalescedevents[1].positionInRootFrame();
     EXPECT_FLOAT_EQ(30, position.x());
     EXPECT_FLOAT_EQ(40, position.y());
-    EXPECT_EQ(100, coalescedevents[1].globalX);
-    EXPECT_EQ(140, coalescedevents[1].globalY);
+    EXPECT_EQ(100, coalescedevents[1].positionInScreen().x);
+    EXPECT_EQ(140, coalescedevents[1].positionInScreen().y);
 
     movement = flooredIntPoint(coalescedevents[1].movementInRootFrame());
     EXPECT_EQ(20, movement.x());
     EXPECT_EQ(10, movement.y());
   }
 
   {
     WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollUpdate,
                                     WebInputEvent::NoModifiers,
                                     WebInputEvent::TimeStampForTesting);
@@ skipping 233 matching lines @@
 
   IntPoint visualOffset(35, 60);
   webViewImpl->page()->visualViewport().setLocation(visualOffset);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
-    webMouseEvent.x = 10;
-    webMouseEvent.y = 10;
-    webMouseEvent.globalX = 10;
-    webMouseEvent.globalY = 10;
+    webMouseEvent.setPositionInWidget(10, 10);
+    webMouseEvent.setPositionInScreen(10, 10);
 
     WebMouseEvent transformedMouseEvent =
         TransformWebMouseEvent(view, webMouseEvent);
     IntPoint position =
         flooredIntPoint(transformedMouseEvent.positionInRootFrame());
     EXPECT_EQ(5 + visualOffset.x(), position.x());
     EXPECT_EQ(5 + visualOffset.y(), position.y());
-    EXPECT_EQ(10, transformedMouseEvent.globalX);
-    EXPECT_EQ(10, transformedMouseEvent.globalY);
+    EXPECT_EQ(10, transformedMouseEvent.positionInScreen().x);
+    EXPECT_EQ(10, transformedMouseEvent.positionInScreen().y);
   }
 
   {
     WebMouseWheelEvent webMouseWheelEvent(WebInputEvent::MouseWheel,
                                           WebInputEvent::NoModifiers,
                                           WebInputEvent::TimeStampForTesting);
-    webMouseWheelEvent.x = 10;
-    webMouseWheelEvent.y = 10;
-    webMouseWheelEvent.globalX = 10;
-    webMouseWheelEvent.globalY = 10;
+    webMouseWheelEvent.setPositionInWidget(10, 10);
+    webMouseWheelEvent.setPositionInScreen(10, 10);
 
     WebMouseWheelEvent scaledMouseWheelEvent =
         TransformWebMouseWheelEvent(view, webMouseWheelEvent);
     IntPoint position =
         flooredIntPoint(scaledMouseWheelEvent.positionInRootFrame());
     EXPECT_EQ(5 + visualOffset.x(), position.x());
     EXPECT_EQ(5 + visualOffset.y(), position.y());
-    EXPECT_EQ(10, scaledMouseWheelEvent.globalX);
-    EXPECT_EQ(10, scaledMouseWheelEvent.globalY);
+    EXPECT_EQ(10, scaledMouseWheelEvent.positionInScreen().x);
+    EXPECT_EQ(10, scaledMouseWheelEvent.positionInScreen().y);
   }
 
   {
     WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollUpdate,
                                     WebInputEvent::NoModifiers,
                                     WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.x = 10;
     webGestureEvent.y = 10;
     webGestureEvent.globalX = 10;
@@ skipping 53 matching lines @@
 
   FloatSize elasticOverscroll(10, -20);
   webViewImpl->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                    elasticOverscroll, 1.0f, 0.0f);
 
   // Just elastic overscroll.
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
-    webMouseEvent.x = 10;
-    webMouseEvent.y = 50;
-    webMouseEvent.globalX = 10;
-    webMouseEvent.globalY = 50;
+    webMouseEvent.setPositionInWidget(10, 50);
+    webMouseEvent.setPositionInScreen(10, 50);
 
     WebMouseEvent transformedMouseEvent =
         TransformWebMouseEvent(view, webMouseEvent);
     IntPoint position =
         flooredIntPoint(transformedMouseEvent.positionInRootFrame());
 
-    EXPECT_EQ(webMouseEvent.x + elasticOverscroll.width(), position.x());
-    EXPECT_EQ(webMouseEvent.y + elasticOverscroll.height(), position.y());
-    EXPECT_EQ(webMouseEvent.globalX, transformedMouseEvent.globalX);
-    EXPECT_EQ(webMouseEvent.globalY, transformedMouseEvent.globalY);
+    EXPECT_EQ(webMouseEvent.positionInWidget().x + elasticOverscroll.width(),
+              position.x());
+    EXPECT_EQ(webMouseEvent.positionInWidget().y + elasticOverscroll.height(),
+              position.y());
+    EXPECT_EQ(webMouseEvent.positionInScreen().x,
+              transformedMouseEvent.positionInScreen().x);
+    EXPECT_EQ(webMouseEvent.positionInScreen().y,
+              transformedMouseEvent.positionInScreen().y);
   }
 
   // Elastic overscroll and pinch-zoom (this doesn't actually ever happen,
   // but ensure that if it were to, the overscroll would be applied after the
   // pinch-zoom).
   float pageScale = 2;
   webViewImpl->setPageScaleFactor(pageScale);
   IntPoint visualOffset(35, 60);
   webViewImpl->page()->visualViewport().setLocation(visualOffset);
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
-    webMouseEvent.x = 10;
-    webMouseEvent.y = 10;
-    webMouseEvent.globalX = 10;
-    webMouseEvent.globalY = 10;
+    webMouseEvent.setPositionInWidget(10, 10);
+    webMouseEvent.setPositionInScreen(10, 10);
 
     WebMouseEvent transformedMouseEvent =
         TransformWebMouseEvent(view, webMouseEvent);
     IntPoint position =
         flooredIntPoint(transformedMouseEvent.positionInRootFrame());
 
-    EXPECT_EQ(webMouseEvent.x / pageScale + visualOffset.x() +
-                  elasticOverscroll.width(),
+    EXPECT_EQ(webMouseEvent.positionInWidget().x / pageScale +
+                  visualOffset.x() + elasticOverscroll.width(),
               position.x());
-    EXPECT_EQ(webMouseEvent.y / pageScale + visualOffset.y() +
-                  elasticOverscroll.height(),
+    EXPECT_EQ(webMouseEvent.positionInWidget().y / pageScale +
+                  visualOffset.y() + elasticOverscroll.height(),
               position.y());
-    EXPECT_EQ(webMouseEvent.globalX, transformedMouseEvent.globalX);
-    EXPECT_EQ(webMouseEvent.globalY, transformedMouseEvent.globalY);
+    EXPECT_EQ(webMouseEvent.positionInScreen().x,
+              transformedMouseEvent.positionInScreen().x);
+    EXPECT_EQ(webMouseEvent.positionInScreen().y,
+              transformedMouseEvent.positionInScreen().y);
   }
 }
 
 // Page reload/navigation should not reset elastic overscroll.
 TEST(WebInputEventConversionTest, ElasticOverscrollWithPageReload) {
   const std::string baseURL("http://www.test6.com/");
   const std::string fileName("fixed_layout.html");
 
   registerMockedURL(baseURL, fileName);
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl =
       webViewHelper.initializeAndLoad(baseURL + fileName, true);
   int pageWidth = 640;
   int pageHeight = 480;
   webViewImpl->resize(WebSize(pageWidth, pageHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   FloatSize elasticOverscroll(10, -20);
   webViewImpl->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                    elasticOverscroll, 1.0f, 0.0f);
   FrameTestHelpers::reloadFrame(webViewHelper.webView()->mainFrame());
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   // Just elastic overscroll.
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
-    webMouseEvent.x = 10;
-    webMouseEvent.y = 50;
-    webMouseEvent.globalX = 10;
-    webMouseEvent.globalY = 50;
+    webMouseEvent.setPositionInWidget(10, 50);
+    webMouseEvent.setPositionInScreen(10, 50);
 
     WebMouseEvent transformedMouseEvent =
         TransformWebMouseEvent(view, webMouseEvent);
     IntPoint position =
         flooredIntPoint(transformedMouseEvent.positionInRootFrame());
 
-    EXPECT_EQ(webMouseEvent.x + elasticOverscroll.width(), position.x());
-    EXPECT_EQ(webMouseEvent.y + elasticOverscroll.height(), position.y());
-    EXPECT_EQ(webMouseEvent.globalX, transformedMouseEvent.globalX);
-    EXPECT_EQ(webMouseEvent.globalY, transformedMouseEvent.globalY);
+    EXPECT_EQ(webMouseEvent.positionInWidget().x + elasticOverscroll.width(),
+              position.x());
+    EXPECT_EQ(webMouseEvent.positionInWidget().y + elasticOverscroll.height(),
+              position.y());
+    EXPECT_EQ(webMouseEvent.positionInScreen().x,
+              transformedMouseEvent.positionInScreen().x);
+    EXPECT_EQ(webMouseEvent.positionInScreen().y,
+              transformedMouseEvent.positionInScreen().y);
   }
 }
 
 }  // namespace blink