WebMouseEvent coordinates are now fractional & private

third_party/WebKit/Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 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 91 matching lines @@
   webEvent.setTimeStampSeconds(event.platformTimeStamp().InSeconds());
   webEvent.setModifiers(event.modifiers());
 
   FrameView* view = frameViewBase ? toFrameView(frameViewBase->parent()) : 0;
   // TODO(bokan): If view == nullptr, pointInRootFrame will really be
   // pointInRootContent.
   IntPoint pointInRootFrame(event.absoluteLocation().x(),
                             event.absoluteLocation().y());
   if (view)
     pointInRootFrame = view->contentsToRootFrame(pointInRootFrame);
-  webEvent.globalX = event.screenX();
-  webEvent.globalY = event.screenY();
+  webEvent.screenPosition.x = event.screenX();
+  webEvent.screenPosition.y = event.screenY();
   IntPoint localPoint = convertAbsoluteLocationForLayoutObjectInt(
       event.absoluteLocation(), layoutItem);
-  webEvent.x = localPoint.x();
-  webEvent.y = localPoint.y();
+  webEvent.position.x = localPoint.x();
+  webEvent.position.y = localPoint.y();
 }
 
 unsigned toWebInputEventModifierFrom(WebMouseEvent::Button button) {
   if (button == WebMouseEvent::Button::NoButton)
     return 0;
 
   unsigned webMouseButtonToPlatformModifier[] = {
       WebInputEvent::LeftButtonDown, WebInputEvent::MiddleButtonDown,
       WebInputEvent::RightButtonDown};
 
@@ skipping 63 matching lines @@
 
 WebMouseEventBuilder::WebMouseEventBuilder(const FrameViewBase* frameViewBase,
                                            const LayoutItem layoutItem,
                                            const MouseEvent& event) {
   if (event.nativeEvent()) {
     *static_cast<WebMouseEvent*>(this) =
         event.nativeEvent()->flattenTransform();
     WebFloatPoint absoluteRootFrameLocation = positionInRootFrame();
     IntPoint localPoint = roundedIntPoint(
         layoutItem.absoluteToLocal(absoluteRootFrameLocation, UseTransforms));
-    x = localPoint.x();
-    y = localPoint.y();
+    position.x = localPoint.x();
+    position.y = localPoint.y();
     return;
   }
 
   // Code below here can be removed once OOPIF ships.
   // OOPIF will prevent synthetic events being dispatched into
   // other frames; but for now we allow the fallback to generate
   // WebMouseEvents from synthetic events.
   if (event.type() == EventTypeNames::mousemove)
     m_type = WebInputEvent::MouseMove;
   else if (event.type() == EventTypeNames::mouseout)
@@ skipping 82 matching lines @@
 
   // The mouse event co-ordinates should be generated from the co-ordinates of
   // the touch point.
   FrameView* view = toFrameView(frameViewBase->parent());
   // FIXME: if view == nullptr, pointInRootFrame will really be
   // pointInRootContent.
   IntPoint pointInRootFrame = roundedIntPoint(touch->absoluteLocation());
   if (view)
     pointInRootFrame = view->contentsToRootFrame(pointInRootFrame);
   IntPoint screenPoint = roundedIntPoint(touch->screenLocation());
-  globalX = screenPoint.x();
-  globalY = screenPoint.y();
+  screenPosition.x = screenPoint.x();
+  screenPosition.y = screenPoint.y();
 
   button = WebMouseEvent::Button::Left;
   m_modifiers |= WebInputEvent::LeftButtonDown;
   clickCount = (m_type == MouseDown || m_type == MouseUp);
 
   IntPoint localPoint = convertAbsoluteLocationForLayoutObjectInt(
       DoublePoint(touch->absoluteLocation()), layoutItem);
-  x = localPoint.x();
-  y = localPoint.y();
+  position.x = localPoint.x();
+  position.y = localPoint.y();
 
   pointerType = WebPointerProperties::PointerType::Touch;
 }
 
 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event) {
   if (const WebKeyboardEvent* webEvent = event.keyEvent()) {
     *static_cast<WebKeyboardEvent*>(this) = *webEvent;
 
     // TODO(dtapuska): DOM KeyboardEvents converted back to WebInputEvents
     // drop the Raw behaviour. Figure out if this is actually really needed.
@@ skipping 36 matching lines @@
   Vector<WebTouchEvent> result;
   for (const auto& event : coalescedEvents) {
     DCHECK(WebInputEvent::isTouchEventType(event->type()));
     result.push_back(TransformWebTouchEvent(
         scale, translation, static_cast<const WebTouchEvent&>(*event)));
   }
   return result;
 }
 
 }  // namespace blink