Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1311)

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.cc

Issue 2782893002: WebMouseEvent coordinates are now fractional & private (Closed)
Patch Set: Fixed compile failures. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_widget_host_view_guest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc
index 53394246b83948b1242900806eb0b81704923eb8..533cf2bb005e87134de0c80ccc18e15562bb6f42 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc
@@ -184,9 +184,7 @@ void RenderWidgetHostViewGuest::ProcessMouseEvent(
// 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.position, event.screenPosition);
}
host_->ForwardMouseEventWithLatencyInfo(event, latency);
}
@@ -566,8 +564,8 @@ void RenderWidgetHostViewGuest::OnHandleInputEvent(
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.position.x /= current_device_scale_factor();
+ rescaled_event.position.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();
@@ -594,8 +592,8 @@ void RenderWidgetHostViewGuest::OnHandleInputEvent(
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.screenPosition.x - GetViewBounds().x(),
+ mouse_event.screenPosition.y - GetViewBounds().y()));
host_->ForwardMouseEvent(mouse_event);
return;
}

Powered by Google App Engine
This is Rietveld 408576698