WebMouseEvent coordinates are now fractional & private

content/renderer/pepper/event_conversion.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/event_conversion.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 195 matching lines @@
 
   const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
   InputEventData result = GetEventWithCommonFieldsAndType(event);
   result.event_modifiers = ConvertEventModifiers(mouse_event.modifiers());
   if (mouse_event.type() == WebInputEvent::MouseDown ||
       mouse_event.type() == WebInputEvent::MouseMove ||
       mouse_event.type() == WebInputEvent::MouseUp) {
     result.mouse_button =
         static_cast<PP_InputEvent_MouseButton>(mouse_event.button);
   }
-  result.mouse_position.x = mouse_event.x;
-  result.mouse_position.y = mouse_event.y;
+  result.mouse_position.x = mouse_event.positionInWidget().x;
+  result.mouse_position.y = mouse_event.positionInWidget().y;
   result.mouse_click_count = mouse_event.clickCount;
   result.mouse_movement.x = mouse_event.movementX;
   result.mouse_movement.y = mouse_event.movementY;
   result_events->push_back(result);
 }
 
 void AppendMouseWheelEvent(const WebInputEvent& event,
                            std::vector<InputEventData>* result_events) {
   const WebMouseWheelEvent& mouse_wheel_event =
       static_cast<const WebMouseWheelEvent&>(event);
@@ skipping 231 matching lines @@
   mouse_event->pointerType = blink::WebPointerProperties::PointerType::Mouse;
   mouse_event->button = static_cast<WebMouseEvent::Button>(event.mouse_button);
   if (mouse_event->type() == WebInputEvent::MouseMove) {
     if (mouse_event->modifiers() & WebInputEvent::LeftButtonDown)
       mouse_event->button = WebMouseEvent::Button::Left;
     else if (mouse_event->modifiers() & WebInputEvent::MiddleButtonDown)
       mouse_event->button = WebMouseEvent::Button::Middle;
     else if (mouse_event->modifiers() & WebInputEvent::RightButtonDown)
       mouse_event->button = WebMouseEvent::Button::Right;
   }
-  mouse_event->x = event.mouse_position.x;
-  mouse_event->y = event.mouse_position.y;
+  mouse_event->setPositionInWidget(event.mouse_position.x,
+                                   event.mouse_position.y);
   mouse_event->clickCount = event.mouse_click_count;
   mouse_event->movementX = event.mouse_movement.x;
   mouse_event->movementY = event.mouse_movement.y;
   return mouse_event;
 }
 
 WebMouseWheelEvent* BuildMouseWheelEvent(const InputEventData& event) {
   WebMouseWheelEvent* mouse_wheel_event = new WebMouseWheelEvent(
       WebInputEvent::MouseWheel, event.event_modifiers, event.event_time_stamp);
   mouse_wheel_event->deltaX = event.wheel_delta.x;
@@ skipping 187 matching lines @@
     case PP_INPUTEVENT_TYPE_TOUCHSTART:
     case PP_INPUTEVENT_TYPE_TOUCHMOVE:
     case PP_INPUTEVENT_TYPE_TOUCHEND:
     case PP_INPUTEVENT_TYPE_TOUCHCANCEL:
       events.push_back(std::move(original_event));
       break;
 
     case PP_INPUTEVENT_TYPE_WHEEL: {
       WebMouseWheelEvent* web_mouse_wheel_event =
           static_cast<WebMouseWheelEvent*>(original_event.get());
-      web_mouse_wheel_event->x = plugin_x;
-      web_mouse_wheel_event->y = plugin_y;
+      web_mouse_wheel_event->setPositionInWidget(plugin_x, plugin_y);
       events.push_back(std::move(original_event));
       break;
     }
 
     case PP_INPUTEVENT_TYPE_RAWKEYDOWN:
     case PP_INPUTEVENT_TYPE_KEYDOWN:
     case PP_INPUTEVENT_TYPE_KEYUP: {
 // Windows key down events should always be "raw" to avoid an ASSERT.
 #if defined(OS_WIN)
       WebKeyboardEvent* web_keyboard_event =
@@ skipping 77 matching lines @@
       return PP_INPUTEVENT_CLASS_TOUCH;
     case WebInputEvent::TouchScrollStarted:
       return PP_InputEvent_Class(0);
     default:
       CHECK(WebInputEvent::isGestureEventType(event.type()));
       return PP_InputEvent_Class(0);
   }
 }
 
 }  // namespace content