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

Unified Diff: content/browser/renderer_host/render_widget_host_input_event_router.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/renderer_host/render_widget_host_input_event_router.cc
diff --git a/content/browser/renderer_host/render_widget_host_input_event_router.cc b/content/browser/renderer_host/render_widget_host_input_event_router.cc
index 2ff6b89c7e198f363acb5cf6bc2328c64490d10b..b408651e1f3415173b2d314c806bb93ec7c654ad 100644
--- a/content/browser/renderer_host/render_widget_host_input_event_router.cc
+++ b/content/browser/renderer_host/render_widget_host_input_event_router.cc
@@ -182,11 +182,12 @@ void RenderWidgetHostInputEventRouter::RouteMouseEvent(
->GetMouseLockWidget()
->GetView();
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), target, &transformed_point))
+ gfx::Point(event->position.x, event->position.y), target,
+ &transformed_point))
return;
- event->x = transformed_point.x();
- event->y = transformed_point.y();
+ event->position.x = transformed_point.x();
+ event->position.y = transformed_point.y();
target->ProcessMouseEvent(*event, latency);
return;
}
@@ -200,12 +201,14 @@ void RenderWidgetHostInputEventRouter::RouteMouseEvent(
event->modifiers() & mouse_button_modifiers)) {
target = mouse_capture_target_.target;
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), target, &transformed_point))
+ gfx::Point(event->position.x, event->position.y), target,
+ &transformed_point))
return;
if (event->type() == blink::WebInputEvent::MouseUp)
mouse_capture_target_.target = nullptr;
} else {
- target = FindEventTarget(root_view, gfx::Point(event->x, event->y),
+ target = FindEventTarget(root_view,
+ gfx::Point(event->position.x, event->position.y),
&transformed_point);
}
@@ -230,11 +233,12 @@ void RenderWidgetHostInputEventRouter::RouteMouseEvent(
// (i.e., owner view is a RenderWidgetHostViewChildFrame).
gfx::Point owner_point;
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), owner_view, &owner_point)) {
+ gfx::Point(event->position.x, event->position.y), owner_view,
+ &owner_point)) {
return;
}
- event->x = owner_point.x();
- event->y = owner_point.y();
+ event->position.x = owner_point.x();
+ event->position.y = owner_point.y();
}
owner_view->ProcessMouseEvent(*event, latency_info);
return;
@@ -254,8 +258,8 @@ void RenderWidgetHostInputEventRouter::RouteMouseEvent(
target != last_mouse_move_target_)
SendMouseEnterOrLeaveEvents(event, target, root_view);
- event->x = transformed_point.x();
- event->y = transformed_point.y();
+ event->position.x = transformed_point.x();
+ event->position.y = transformed_point.y();
target->ProcessMouseEvent(*event, latency);
}
@@ -272,18 +276,20 @@ void RenderWidgetHostInputEventRouter::RouteMouseWheelEvent(
->GetMouseLockWidget()
->GetView();
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), target, &transformed_point))
+ gfx::Point(event->position.x, event->position.y), target,
+ &transformed_point))
return;
} else {
- target = FindEventTarget(root_view, gfx::Point(event->x, event->y),
+ target = FindEventTarget(root_view,
+ gfx::Point(event->position.x, event->position.y),
&transformed_point);
}
if (!target)
return;
- event->x = transformed_point.x();
- event->y = transformed_point.y();
+ event->position.x = transformed_point.x();
+ event->position.y = transformed_point.y();
target->ProcessMouseWheelEvent(*event, latency);
}
@@ -493,10 +499,11 @@ void RenderWidgetHostInputEventRouter::SendMouseEnterOrLeaveEvents(
// propagated to its embedding surface, which makes it impossible to
// compute the transformation for it
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), view, &transformed_point))
+ gfx::Point(event->position.x, event->position.y), view,
+ &transformed_point))
transformed_point = gfx::Point();
- mouse_leave.x = transformed_point.x();
- mouse_leave.y = transformed_point.y();
+ mouse_leave.position.x = transformed_point.x();
+ mouse_leave.position.y = transformed_point.y();
view->ProcessMouseEvent(mouse_leave, ui::LatencyInfo());
}
@@ -505,11 +512,11 @@ void RenderWidgetHostInputEventRouter::SendMouseEnterOrLeaveEvents(
blink::WebMouseEvent mouse_move(*event);
mouse_move.setType(blink::WebInputEvent::MouseMove);
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), common_ancestor,
+ gfx::Point(event->position.x, event->position.y), common_ancestor,
&transformed_point))
transformed_point = gfx::Point();
- mouse_move.x = transformed_point.x();
- mouse_move.y = transformed_point.y();
+ mouse_move.position.x = transformed_point.x();
+ mouse_move.position.y = transformed_point.y();
common_ancestor->ProcessMouseEvent(mouse_move, ui::LatencyInfo());
}
@@ -520,10 +527,11 @@ void RenderWidgetHostInputEventRouter::SendMouseEnterOrLeaveEvents(
blink::WebMouseEvent mouse_enter(*event);
mouse_enter.setType(blink::WebInputEvent::MouseMove);
if (!root_view->TransformPointToCoordSpaceForView(
- gfx::Point(event->x, event->y), view, &transformed_point))
+ gfx::Point(event->position.x, event->position.y), view,
+ &transformed_point))
transformed_point = gfx::Point();
- mouse_enter.x = transformed_point.x();
- mouse_enter.y = transformed_point.y();
+ mouse_enter.position.x = transformed_point.x();
+ mouse_enter.position.y = transformed_point.y();
view->ProcessMouseEvent(mouse_enter, ui::LatencyInfo());
}

Powered by Google App Engine
This is Rietveld 408576698