WebMouseEvent coordinates are now fractional & private

content/browser/frame_host/render_widget_host_view_guest.cc

 // Copyright 2014 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/browser/frame_host/render_widget_host_view_guest.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 166 matching lines @@
     DCHECK(guest_->GetOwnerRenderWidgetHostView());
     RenderWidgetHost* embedder =
         guest_->GetOwnerRenderWidgetHostView()->GetRenderWidgetHost();
     if (!embedder->GetView()->HasFocus())
       embedder->GetView()->Focus();
 
     // With direct routing, the embedder would not know to focus the guest on
     // click. Sends a synthetic event for the focusing side effect.
     // TODO(wjmaclean): When we remove BrowserPlugin, delete this code.
     // http://crbug.com/533069
-    MaybeSendSyntheticTapGesture(
-        blink::WebFloatPoint(event.x, event.y),
-        blink::WebFloatPoint(event.globalX, event.globalY));
+    MaybeSendSyntheticTapGesture(event.positionInWidget(),
+                                 event.positionInScreen());
   }
   host_->ForwardMouseEventWithLatencyInfo(event, latency);
 }
 
 void RenderWidgetHostViewGuest::ProcessTouchEvent(
     const blink::WebTouchEvent& event,
     const ui::LatencyInfo& latency) {
   if (event.type() == blink::WebInputEvent::TouchStart) {
     DCHECK(guest_->GetOwnerRenderWidgetHostView());
     RenderWidgetHost* embedder =
@@ skipping 357 matching lines @@
     int browser_plugin_instance_id,
     const blink::WebInputEvent* event) {
   // WebMouseWheelEvents go into a queue, and may not be forwarded to the
   // renderer until after this method goes out of scope. Therefore we need to
   // explicitly remove the additional device scale factor from the coordinates
   // before allowing the event to be queued.
   if (IsUseZoomForDSFEnabled() &&
       event->type() == blink::WebInputEvent::MouseWheel) {
     blink::WebMouseWheelEvent rescaled_event =
         *static_cast<const blink::WebMouseWheelEvent*>(event);
-    rescaled_event.x /= current_device_scale_factor();
-    rescaled_event.y /= current_device_scale_factor();
+    rescaled_event.setPositionInWidget(
+        rescaled_event.positionInWidget().x / current_device_scale_factor(),
+        rescaled_event.positionInWidget().y / current_device_scale_factor());
     rescaled_event.deltaX /= current_device_scale_factor();
     rescaled_event.deltaY /= current_device_scale_factor();
     rescaled_event.wheelTicksX /= current_device_scale_factor();
     rescaled_event.wheelTicksY /= current_device_scale_factor();
     ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
     host_->ForwardWheelEventWithLatencyInfo(rescaled_event, latency_info);
     return;
   }
 
   ScopedInputScaleDisabler disable(host_, current_device_scale_factor());
   if (blink::WebInputEvent::isMouseEventType(event->type())) {
     // The mouse events for BrowserPlugin are modified by all
     // the CSS transforms applied on the <object> and embedder. As a result of
     // this, the coordinates passed on to the guest renderer are potentially
     // incorrect to determine the position of the context menu(they are not the
     // actual X, Y of the window). As a hack, we report the last location of a
     // right mouse up to the BrowserPluginGuest to inform it of the next
     // potential location for context menu (BUG=470087).
     // TODO(ekaramad): Find a better and more fundamental solution. Could the
     // ContextMenuParams be based on global X, Y?
     const blink::WebMouseEvent& mouse_event =
         static_cast<const blink::WebMouseEvent&>(*event);
     // A MouseDown on the ButtonRight could suggest a ContextMenu.
     if (guest_ && mouse_event.type() == blink::WebInputEvent::MouseDown &&
         mouse_event.button == blink::WebPointerProperties::Button::Right)
       guest_->SetContextMenuPosition(
-          gfx::Point(mouse_event.globalX - GetViewBounds().x(),
-                     mouse_event.globalY - GetViewBounds().y()));
+          gfx::Point(mouse_event.positionInScreen().x - GetViewBounds().x(),
+                     mouse_event.positionInScreen().y - GetViewBounds().y()));
     host_->ForwardMouseEvent(mouse_event);
     return;
   }
 
   if (event->type() == blink::WebInputEvent::MouseWheel) {
     ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
     host_->ForwardWheelEventWithLatencyInfo(
         *static_cast<const blink::WebMouseWheelEvent*>(event), latency_info);
     return;
   }
@@ skipping 37 matching lines @@
     host_->ForwardGestureEvent(gesture_event);
     return;
   }
 }
 
 bool RenderWidgetHostViewGuest::HasEmbedderChanged() {
   return guest_ && guest_->has_attached_since_surface_set();
 }
 
 }  // namespace content