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

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: 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 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 <vector> 7 #include <vector>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 } 56 }
57 57
58 // If the target that's being destroyed is in the gesture target queue, we 58 // If the target that's being destroyed is in the gesture target queue, we
59 // replace it with nullptr so that we maintain the 1:1 correspondence between 59 // replace it with nullptr so that we maintain the 1:1 correspondence between
60 // queue entries and the touch sequences that underly them. 60 // queue entries and the touch sequences that underly them.
61 for (size_t i = 0; i < touchscreen_gesture_target_queue_.size(); ++i) { 61 for (size_t i = 0; i < touchscreen_gesture_target_queue_.size(); ++i) {
62 if (touchscreen_gesture_target_queue_[i].target == view) 62 if (touchscreen_gesture_target_queue_[i].target == view)
63 touchscreen_gesture_target_queue_[i].target = nullptr; 63 touchscreen_gesture_target_queue_[i].target = nullptr;
64 } 64 }
65 65
66 if (view == mouse_capture_target_.target)
67 mouse_capture_target_.target = nullptr;
68
66 if (view == touchscreen_gesture_target_.target) 69 if (view == touchscreen_gesture_target_.target)
67 touchscreen_gesture_target_.target = nullptr; 70 touchscreen_gesture_target_.target = nullptr;
68 71
69 if (view == touchpad_gesture_target_.target) 72 if (view == touchpad_gesture_target_.target)
70 touchpad_gesture_target_.target = nullptr; 73 touchpad_gesture_target_.target = nullptr;
71 74
72 if (view == bubbling_gesture_scroll_target_.target || 75 if (view == bubbling_gesture_scroll_target_.target ||
73 view == first_bubbling_scroll_target_.target) { 76 view == first_bubbling_scroll_target_.target) {
74 bubbling_gesture_scroll_target_.target = nullptr; 77 bubbling_gesture_scroll_target_.target = nullptr;
75 first_bubbling_scroll_target_.target = nullptr; 78 first_bubbling_scroll_target_.target = nullptr;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // parent frame has not sent a new compositor frame since that happened. 164 // parent frame has not sent a new compositor frame since that happened.
162 if (iter == owner_map_.end()) 165 if (iter == owner_map_.end())
163 return root_view; 166 return root_view;
164 167
165 return iter->second; 168 return iter->second;
166 } 169 }
167 170
168 void RenderWidgetHostInputEventRouter::RouteMouseEvent( 171 void RenderWidgetHostInputEventRouter::RouteMouseEvent(
169 RenderWidgetHostViewBase* root_view, 172 RenderWidgetHostViewBase* root_view,
170 blink::WebMouseEvent* event) { 173 blink::WebMouseEvent* event) {
174 RenderWidgetHostViewBase* target;
171 gfx::Point transformed_point; 175 gfx::Point transformed_point;
172 RenderWidgetHostViewBase* target = FindEventTarget( 176 const int mouse_button_modifiers = blink::WebInputEvent::LeftButtonDown |
173 root_view, gfx::Point(event->x, event->y), &transformed_point); 177 blink::WebInputEvent::MiddleButtonDown |
178 blink::WebInputEvent::RightButtonDown;
179 if (mouse_capture_target_.target &&
180 event->type != blink::WebInputEvent::MouseDown &&
181 (event->type == blink::WebInputEvent::MouseUp ||
182 event->modifiers & mouse_button_modifiers)) {
183 target = mouse_capture_target_.target;
184 transformed_point = root_view->TransformPointToCoordSpaceForView(
185 gfx::Point(event->x, event->y), target);
186 if (event->type == blink::WebInputEvent::MouseUp)
187 mouse_capture_target_.target = nullptr;
188 } else {
189 target = FindEventTarget(root_view, gfx::Point(event->x, event->y),
190 &transformed_point);
191 }
192
193 if (event->type == blink::WebInputEvent::MouseDown)
194 mouse_capture_target_.target = target;
195
174 if (!target) 196 if (!target)
175 return; 197 return;
176 198
177 // SendMouseEnterOrLeaveEvents is called with the original event 199 // SendMouseEnterOrLeaveEvents is called with the original event
178 // coordinates, which are transformed independently for each view that will 200 // coordinates, which are transformed independently for each view that will
179 // receive an event. 201 // receive an event.
180 if ((event->type == blink::WebInputEvent::MouseLeave || 202 if ((event->type == blink::WebInputEvent::MouseLeave ||
181 event->type == blink::WebInputEvent::MouseMove) && 203 event->type == blink::WebInputEvent::MouseMove) &&
182 target != last_mouse_move_target_) 204 target != last_mouse_move_target_)
183 SendMouseEnterOrLeaveEvents(event, target, root_view); 205 SendMouseEnterOrLeaveEvents(event, target, root_view);
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 if (!touchpad_gesture_target_.target) 707 if (!touchpad_gesture_target_.target)
686 return; 708 return;
687 709
688 // TODO(mohsen): Add tests to check event location. 710 // TODO(mohsen): Add tests to check event location.
689 event->x += touchpad_gesture_target_.delta.x(); 711 event->x += touchpad_gesture_target_.delta.x();
690 event->y += touchpad_gesture_target_.delta.y(); 712 event->y += touchpad_gesture_target_.delta.y();
691 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency); 713 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency);
692 } 714 }
693 715
694 } // namespace content 716 } // namespace content
OLDNEW
« 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