WebMouseEvent coordinates are now fractional & private

ui/events/blink/web_input_event.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 "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/blink/blink_features.h"
 #include "ui/events/event.h"
@@ skipping 217 matching lines @@
           ? MakeUntranslatedWebMouseEventFromNativeEvent(
                 event.native_event(), event.time_stamp(),
                 EventPointerTypeToWebPointerType(
                     event.pointer_details().pointer_type))
           : MakeWebMouseEventFromUiEvent(event);
 #else
       MakeWebMouseEventFromUiEvent(event);
 #endif
   // Replace the event's coordinate fields with translated position data from
   // |event|.
-  webkit_event.x = event.x();
-  webkit_event.y = event.y();
+  webkit_event.position.x = event.x();
+  webkit_event.position.y = event.y();
 
 #if defined(OS_WIN)
   if (event.native_event().message)
     return webkit_event;
 #endif
 
   const gfx::Point screen_point =
       GetScreenLocationFromEvent(event, screen_location_callback);
-  webkit_event.globalX = screen_point.x();
-  webkit_event.globalY = screen_point.y();
+  webkit_event.screenPosition.x = screen_point.x();
+  webkit_event.screenPosition.y = screen_point.y();
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
     const MouseWheelEvent& event,
     const base::Callback<gfx::Point(const LocatedEvent& event)>&
         screen_location_callback) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   blink::WebMouseWheelEvent webkit_event =
       event.native_event().message
           ? MakeUntranslatedWebMouseWheelEventFromNativeEvent(
                 event.native_event(), event.time_stamp(),
                 EventPointerTypeToWebPointerType(
                     event.pointer_details().pointer_type))
           : MakeWebMouseWheelEventFromUiEvent(event);
 #else
   blink::WebMouseWheelEvent webkit_event =
       MakeWebMouseWheelEventFromUiEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
   // |event|.
-  webkit_event.x = event.x();
-  webkit_event.y = event.y();
+  webkit_event.position.x = event.x();
+  webkit_event.position.y = event.y();
 
   const gfx::Point screen_point =
       GetScreenLocationFromEvent(event, screen_location_callback);
-  webkit_event.globalX = screen_point.x();
-  webkit_event.globalY = screen_point.y();
+  webkit_event.screenPosition.x = screen_point.x();
+  webkit_event.screenPosition.y = screen_point.y();
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
     const ScrollEvent& event,
     const base::Callback<gfx::Point(const LocatedEvent& event)>&
         screen_location_callback) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   blink::WebMouseWheelEvent webkit_event =
       event.native_event().message
           ? MakeUntranslatedWebMouseWheelEventFromNativeEvent(
                 event.native_event(), event.time_stamp(),
                 EventPointerTypeToWebPointerType(
                     event.pointer_details().pointer_type))
           : MakeWebMouseWheelEventFromUiEvent(event);
 #else
   blink::WebMouseWheelEvent webkit_event =
       MakeWebMouseWheelEventFromUiEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
   // |event|.
-  webkit_event.x = event.x();
-  webkit_event.y = event.y();
+  webkit_event.position.x = event.x();
+  webkit_event.position.y = event.y();
 
   const gfx::Point screen_point =
       GetScreenLocationFromEvent(event, screen_location_callback);
-  webkit_event.globalX = screen_point.x();
-  webkit_event.globalY = screen_point.y();
+  webkit_event.screenPosition.x = screen_point.x();
+  webkit_event.screenPosition.y = screen_point.y();
 
   return webkit_event;
 }
 
 blink::WebKeyboardEvent MakeWebKeyboardEvent(const KeyEvent& event) {
 // Windows can figure out whether or not to construct a RawKeyDown or a Char
 // WebInputEvent based on the type of message carried in
 // event.native_event(). X11 is not so fortunate, there is no separate
 // translated event type, so DesktopHostLinux sends an extra KeyEvent with
 // is_char() == true. We need to pass the KeyEvent to the X11 function
@@ skipping 148 matching lines @@
   webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
   webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
   webkit_event.force = event.pointer_details().force;
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
 
   return webkit_event;
 }
 
 }  // namespace ui