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

Side by Side 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: Clear capture target on its destruction 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_input_event_router.h" 5 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
6 6
7 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
8 #include "cc/quads/surface_draw_quad.h" 8 #include "cc/quads/surface_draw_quad.h"
9 #include "cc/surfaces/surface_id_allocator.h" 9 #include "cc/surfaces/surface_id_allocator.h"
10 #include "cc/surfaces/surface_manager.h" 10 #include "cc/surfaces/surface_manager.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 53
54 // If the target that's being destroyed is in the gesture target queue, we 54 // If the target that's being destroyed is in the gesture target queue, we
55 // replace it with nullptr so that we maintain the 1:1 correspondence between 55 // replace it with nullptr so that we maintain the 1:1 correspondence between
56 // queue entries and the touch sequences that underly them. 56 // queue entries and the touch sequences that underly them.
57 for (size_t i = 0; i < touchscreen_gesture_target_queue_.size(); ++i) { 57 for (size_t i = 0; i < touchscreen_gesture_target_queue_.size(); ++i) {
58 if (touchscreen_gesture_target_queue_[i].target == view) 58 if (touchscreen_gesture_target_queue_[i].target == view)
59 touchscreen_gesture_target_queue_[i].target = nullptr; 59 touchscreen_gesture_target_queue_[i].target = nullptr;
60 } 60 }
61 61
62 if (view == mouse_capture_target_.target)
63 mouse_capture_target_.target = nullptr;
64
62 if (view == touchscreen_gesture_target_.target) 65 if (view == touchscreen_gesture_target_.target)
63 touchscreen_gesture_target_.target = nullptr; 66 touchscreen_gesture_target_.target = nullptr;
64 67
65 if (view == touchpad_gesture_target_.target) 68 if (view == touchpad_gesture_target_.target)
66 touchpad_gesture_target_.target = nullptr; 69 touchpad_gesture_target_.target = nullptr;
67 70
68 if (view == bubbling_gesture_scroll_target_.target || 71 if (view == bubbling_gesture_scroll_target_.target ||
69 view == first_bubbling_scroll_target_.target) { 72 view == first_bubbling_scroll_target_.target) {
70 bubbling_gesture_scroll_target_.target = nullptr; 73 bubbling_gesture_scroll_target_.target = nullptr;
71 first_bubbling_scroll_target_.target = nullptr; 74 first_bubbling_scroll_target_.target = nullptr;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // parent frame has not sent a new compositor frame since that happened. 143 // parent frame has not sent a new compositor frame since that happened.
141 if (iter == owner_map_.end()) 144 if (iter == owner_map_.end())
142 return root_view; 145 return root_view;
143 146
144 return iter->second; 147 return iter->second;
145 } 148 }
146 149
147 void RenderWidgetHostInputEventRouter::RouteMouseEvent( 150 void RenderWidgetHostInputEventRouter::RouteMouseEvent(
148 RenderWidgetHostViewBase* root_view, 151 RenderWidgetHostViewBase* root_view,
149 blink::WebMouseEvent* event) { 152 blink::WebMouseEvent* event) {
153 RenderWidgetHostViewBase* target;
150 gfx::Point transformed_point; 154 gfx::Point transformed_point;
151 RenderWidgetHostViewBase* target = FindEventTarget( 155 const int mouse_button_modifiers = blink::WebInputEvent::LeftButtonDown |
152 root_view, gfx::Point(event->x, event->y), &transformed_point); 156 blink::WebInputEvent::MiddleButtonDown |
157 blink::WebInputEvent::RightButtonDown;
158 if (mouse_capture_target_.target &&
159 event->type != blink::WebInputEvent::MouseDown &&
160 (event->type == blink::WebInputEvent::MouseUp ||
161 event->modifiers & mouse_button_modifiers)) {
162 target = mouse_capture_target_.target;
163 transformed_point = root_view->TransformPointToCoordSpaceForView(
164 gfx::Point(event->x, event->y), target);
165 if (event->type == blink::WebInputEvent::MouseUp)
166 mouse_capture_target_.target = nullptr;
167 } else {
168 target = FindEventTarget(root_view, gfx::Point(event->x, event->y),
169 &transformed_point);
170 }
171
172 if (event->type == blink::WebInputEvent::MouseDown)
173 mouse_capture_target_.target = target;
174
153 if (!target) 175 if (!target)
154 return; 176 return;
155 177
156 event->x = transformed_point.x(); 178 event->x = transformed_point.x();
157 event->y = transformed_point.y(); 179 event->y = transformed_point.y();
158 // TODO(wjmaclean): Initialize latency info correctly for OOPIFs. 180 // TODO(wjmaclean): Initialize latency info correctly for OOPIFs.
159 // https://crbug.com/613628 181 // https://crbug.com/613628
160 ui::LatencyInfo latency_info; 182 ui::LatencyInfo latency_info;
161 target->ProcessMouseEvent(*event, latency_info); 183 target->ProcessMouseEvent(*event, latency_info);
162 } 184 }
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 if (!touchpad_gesture_target_.target) 571 if (!touchpad_gesture_target_.target)
550 return; 572 return;
551 573
552 // TODO(mohsen): Add tests to check event location. 574 // TODO(mohsen): Add tests to check event location.
553 event->x += touchpad_gesture_target_.delta.x(); 575 event->x += touchpad_gesture_target_.delta.x();
554 event->y += touchpad_gesture_target_.delta.y(); 576 event->y += touchpad_gesture_target_.delta.y();
555 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency); 577 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency);
556 } 578 }
557 579
558 } // namespace content 580 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698