Chromium Code Reviews| 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 d30662c17a268fe3115e4e6e9208a89d0a309bec..2f6e9f6c201521abcaa42dd53784db19f5d092b8 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 |
| @@ -147,9 +147,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 && |
|
dtapuska
2016/09/13 20:15:14
Should you not be clearing the target when the vie
kenrb
2016/09/13 20:18:49
I definitely should. Thanks for catching that.
Fi
|
| + 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; |