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

Unified Diff: content/browser/renderer_host/render_widget_host_input_event_router.cc

Issue 2765903002: Fix routing of mouse wheel events while pointer is locked. (Closed)
Patch Set: rebase 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
« no previous file with comments | « content/browser/pointer_lock_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2b0afcbf377a1a3b0b2c9191d0b2c5eafa7d6118..2ff6b89c7e198f363acb5cf6bc2328c64490d10b 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
@@ -263,18 +263,22 @@ void RenderWidgetHostInputEventRouter::RouteMouseWheelEvent(
RenderWidgetHostViewBase* root_view,
blink::WebMouseWheelEvent* event,
const ui::LatencyInfo& latency) {
+ RenderWidgetHostViewBase* target = nullptr;
+ gfx::Point transformed_point;
+
if (root_view->IsMouseLocked()) {
- RenderWidgetHostImpl::From(root_view->GetRenderWidgetHost())
- ->delegate()
- ->GetMouseLockWidget()
- ->GetView()
- ->ProcessMouseEvent(*event, latency);
- return;
+ target = RenderWidgetHostImpl::From(root_view->GetRenderWidgetHost())
+ ->delegate()
+ ->GetMouseLockWidget()
+ ->GetView();
+ if (!root_view->TransformPointToCoordSpaceForView(
+ gfx::Point(event->x, event->y), target, &transformed_point))
+ return;
+ } else {
+ target = FindEventTarget(root_view, gfx::Point(event->x, event->y),
+ &transformed_point);
}
- gfx::Point transformed_point;
- RenderWidgetHostViewBase* target = FindEventTarget(
- root_view, gfx::Point(event->x, event->y), &transformed_point);
if (!target)
return;
« no previous file with comments | « content/browser/pointer_lock_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698