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

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

Issue 2339503002: Allow OOPIFs to capture mouse input while mouse button is held down (Closed)
Patch Set: Fix test breakage caused by rebase Created 4 years, 3 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 6454ed30a8656ec6aba10783561052770b836071..e3898e87afc9ad26b95c7ce13afdbb8ef9452777 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
@@ -63,6 +63,9 @@ void RenderWidgetHostInputEventRouter::OnRenderWidgetHostViewBaseDestroyed(
touchscreen_gesture_target_queue_[i].target = nullptr;
}
+ if (view == mouse_capture_target_.target)
+ mouse_capture_target_.target = nullptr;
+
if (view == touchscreen_gesture_target_.target)
touchscreen_gesture_target_.target = nullptr;
@@ -168,9 +171,28 @@ RenderWidgetHostViewBase* RenderWidgetHostInputEventRouter::FindEventTarget(
void RenderWidgetHostInputEventRouter::RouteMouseEvent(
RenderWidgetHostViewBase* root_view,
blink::WebMouseEvent* event) {
+ RenderWidgetHostViewBase* target;
gfx::Point transformed_point;
- RenderWidgetHostViewBase* target = FindEventTarget(
- root_view, gfx::Point(event->x, event->y), &transformed_point);
+ const int mouse_button_modifiers = blink::WebInputEvent::LeftButtonDown |
+ blink::WebInputEvent::MiddleButtonDown |
+ blink::WebInputEvent::RightButtonDown;
+ if (mouse_capture_target_.target &&
+ event->type != blink::WebInputEvent::MouseDown &&
+ (event->type == blink::WebInputEvent::MouseUp ||
+ event->modifiers & mouse_button_modifiers)) {
+ target = mouse_capture_target_.target;
+ transformed_point = root_view->TransformPointToCoordSpaceForView(
+ gfx::Point(event->x, event->y), target);
+ if (event->type == blink::WebInputEvent::MouseUp)
+ mouse_capture_target_.target = nullptr;
+ } else {
+ target = FindEventTarget(root_view, gfx::Point(event->x, event->y),
+ &transformed_point);
+ }
+
+ if (event->type == blink::WebInputEvent::MouseDown)
+ mouse_capture_target_.target = target;
+
if (!target)
return;
« no previous file with comments | « content/browser/renderer_host/render_widget_host_input_event_router.h ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698