WebMouseEvent coordinates are now fractional & private

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 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 478 matching lines @@
   RefPtr<WebPagePopupImpl> pagePopup;
   if (event.button == WebMouseEvent::Button::Left) {
     pagePopup = m_pagePopup;
     hidePopups();
     DCHECK(!m_pagePopup);
   }
 
   // Take capture on a mouse down on a plugin so we can send it mouse events.
   // If the hit node is a plugin but a scrollbar is over it don't start mouse
   // capture because it will interfere with the scrollbar receiving events.
-  IntPoint point(event.x, event.y);
+  IntPoint point(event.position.x, event.position.y);
   if (event.button == WebMouseEvent::Button::Left &&
       m_page->mainFrame()->isLocalFrame()) {
     point =
         m_page->deprecatedLocalMainFrame()->view()->rootFrameToContents(point);
     HitTestResult result(
         m_page->deprecatedLocalMainFrame()->eventHandler().hitTestResultAtPoint(
             point));
     result.setToShadowHostIfInRestrictedShadowRoot();
     Node* hitNode = result.innerNodeOrImageMapImage();
 
@@ skipping 120 matching lines @@
     WebMouseWheelEvent syntheticWheel(WebInputEvent::MouseWheel,
                                       m_flingModifier,
                                       WTF::monotonicallyIncreasingTime());
     const float tickDivisor = WheelEvent::TickMultiplier;
 
     syntheticWheel.deltaX = delta.width;
     syntheticWheel.deltaY = delta.height;
     syntheticWheel.wheelTicksX = delta.width / tickDivisor;
     syntheticWheel.wheelTicksY = delta.height / tickDivisor;
     syntheticWheel.hasPreciseScrollingDeltas = true;
-    syntheticWheel.x = m_positionOnFlingStart.x;
-    syntheticWheel.y = m_positionOnFlingStart.y;
-    syntheticWheel.globalX = m_globalPositionOnFlingStart.x;
-    syntheticWheel.globalY = m_globalPositionOnFlingStart.y;
+    syntheticWheel.position.x = m_positionOnFlingStart.x;
+    syntheticWheel.position.y = m_positionOnFlingStart.y;
+    syntheticWheel.screenPosition.x = m_globalPositionOnFlingStart.x;
+    syntheticWheel.screenPosition.y = m_globalPositionOnFlingStart.y;
 
     if (handleMouseWheel(*m_page->deprecatedLocalMainFrame(), syntheticWheel) !=
         WebInputEventResult::NotHandled)
       return true;
 
     if (!enableTouchpadScrollLatching) {
       WebGestureEvent syntheticScrollBegin = createGestureScrollEventFromFling(
           WebInputEvent::GestureScrollBegin, WebGestureDeviceTouchpad);
       syntheticScrollBegin.data.scrollBegin.deltaXHint = delta.width;
       syntheticScrollBegin.data.scrollBegin.deltaYHint = delta.height;
@@ skipping 282 matching lines @@
   DCHECK_EQ(pinchEvent.type(), WebInputEvent::GesturePinchUpdate);
 
   // For pinch gesture events, match typical trackpad behavior on Windows by
   // sending fake wheel events with the ctrl modifier set when we see trackpad
   // pinch gestures.  Ideally we'd someday get a platform 'pinch' event and
   // send that instead.
   WebMouseWheelEvent wheelEvent(
       WebInputEvent::MouseWheel,
       pinchEvent.modifiers() | WebInputEvent::ControlKey,
       pinchEvent.timeStampSeconds());
-  wheelEvent.x = pinchEvent.x;
-  wheelEvent.y = pinchEvent.y;
-  wheelEvent.globalX = pinchEvent.globalX;
-  wheelEvent.globalY = pinchEvent.globalY;
+  wheelEvent.position.x = pinchEvent.x;
+  wheelEvent.position.y = pinchEvent.y;
+  wheelEvent.screenPosition.x = pinchEvent.globalX;
+  wheelEvent.screenPosition.y = pinchEvent.globalY;
   wheelEvent.deltaX = 0;
 
   // The function to convert scales to deltaY values is designed to be
   // compatible with websites existing use of wheel events, and with existing
   // Windows trackpad behavior.  In particular, we want:
   //  - deltas should accumulate via addition: f(s1*s2)==f(s1)+f(s2)
   //  - deltas should invert via negation: f(1/s) == -f(s)
   //  - zoom in should be positive: f(s) > 0 iff s > 1
   //  - magnitude roughly matches wheels: f(2) > 25 && f(2) < 100
   //  - a formula that's relatively easy to use from JavaScript
@@ skipping 3217 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink