WebMouseEvent coordinates are now fractional & private

ui/events/blink/web_input_event_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 "ui/events/blink/web_input_event.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 242 matching lines @@
                         EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Left released.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_RELEASED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, 0,
                         EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Middle pressed.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, EF_MIDDLE_MOUSE_BUTTON,
                         EF_MIDDLE_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Middle released.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_RELEASED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, 0,
                         EF_MIDDLE_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Right pressed.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, EF_RIGHT_MOUSE_BUTTON,
                         EF_RIGHT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Right released.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_RELEASED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, 0,
                         EF_RIGHT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Moved
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_MOVED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, 0, 0);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Moved with left down
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_MOVED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
                         0);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Left with shift pressed.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(
         ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
         EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Default values for PointerDetails.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
                         EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
 
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
     EXPECT_EQ(0, webkit_event.tiltX);
     EXPECT_EQ(0, webkit_event.tiltY);
     EXPECT_TRUE(std::isnan(webkit_event.force));
     EXPECT_EQ(0.0f, webkit_event.tangentialPressure);
     EXPECT_EQ(0, webkit_event.twist);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
   {
     // Stylus values for PointerDetails.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
                         gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
                         EF_LEFT_MOUSE_BUTTON);
     PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
                                    /* id */ 63,
                                    /* radius_x */ 0.0f,
                                    /* radius_y */ 0.0f,
                                    /* force */ 0.8f,
                                    /* tilt_x */ 89.5f,
                                    /* tilt_y */ -89.5f,
                                    /* tangential_pressure */ 0.6f,
                                    /* twist */ 269);
     ui_event.set_pointer_details(pointer_details);
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
 
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Pen,
               webkit_event.pointerType);
     EXPECT_EQ(90, webkit_event.tiltX);
     EXPECT_EQ(-90, webkit_event.tiltY);
     EXPECT_FLOAT_EQ(0.8f, webkit_event.force);
     EXPECT_FLOAT_EQ(0.6f, webkit_event.tangentialPressure);
     EXPECT_EQ(269, webkit_event.twist);
     EXPECT_EQ(63, webkit_event.id);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
 }
 
 TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) {
   {
     // Mouse wheel.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseWheelEvent ui_event(gfx::Vector2d(MouseWheelEvent::kWheelDelta * 2,
                                            -MouseWheelEvent::kWheelDelta * 2),
                              gfx::Point(123, 321), gfx::Point(123, 321),
@@ skipping 10 matching lines @@
                     webkit_event.wheelTicksX);
     EXPECT_FLOAT_EQ(ui_event.y_offset() / MouseWheelEvent::kWheelDelta,
                     webkit_event.wheelTicksY);
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
     EXPECT_EQ(0, webkit_event.tiltX);
     EXPECT_EQ(0, webkit_event.tiltY);
     EXPECT_TRUE(std::isnan(webkit_event.force));
     EXPECT_EQ(0.0f, webkit_event.tangentialPressure);
     EXPECT_EQ(0, webkit_event.twist);
-    EXPECT_EQ(123, webkit_event.x);
-    EXPECT_EQ(321, webkit_event.y);
+    EXPECT_EQ(123, webkit_event.positionInWidget().x);
+    EXPECT_EQ(321, webkit_event.positionInWidget().y);
   }
 }
 
 TEST(WebInputEventTest, KeyEvent) {
   struct {
     ui::KeyEvent event;
     blink::WebInputEvent::Type web_type;
     int web_modifiers;
   } tests[] = {
       {ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE),
@@ skipping 52 matching lines @@
 
   for (size_t i = 0; i < arraysize(tests); i++) {
     ui::MouseEvent ui_event(tests[i].ui_type, tests[i].location,
                             tests[i].screen_location, base::TimeTicks(),
                             tests[i].ui_modifiers, 0);
     blink::WebMouseEvent web_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     ASSERT_TRUE(blink::WebInputEvent::isMouseEventType(web_event.type()));
     ASSERT_EQ(tests[i].web_type, web_event.type());
     ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers());
-    ASSERT_EQ(tests[i].location.x(), web_event.x);
-    ASSERT_EQ(tests[i].location.y(), web_event.y);
-    ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX);
-    ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY);
+    ASSERT_EQ(tests[i].location.x(), web_event.positionInWidget().x);
+    ASSERT_EQ(tests[i].location.y(), web_event.positionInWidget().y);
+    ASSERT_EQ(tests[i].screen_location.x(), web_event.positionInScreen().x);
+    ASSERT_EQ(tests[i].screen_location.y(), web_event.positionInScreen().y);
   }
 }
 
 }  // namespace ui