OLD | NEW |
---|---|
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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
166 if (iter == owner_map_.end()) | 166 if (iter == owner_map_.end()) |
167 return root_view; | 167 return root_view; |
168 | 168 |
169 return iter->second; | 169 return iter->second; |
170 } | 170 } |
171 | 171 |
172 void RenderWidgetHostInputEventRouter::RouteMouseEvent( | 172 void RenderWidgetHostInputEventRouter::RouteMouseEvent( |
173 RenderWidgetHostViewBase* root_view, | 173 RenderWidgetHostViewBase* root_view, |
174 blink::WebMouseEvent* event, | 174 blink::WebMouseEvent* event, |
175 const ui::LatencyInfo& latency) { | 175 const ui::LatencyInfo& latency) { |
176 if (root_view->IsMouseLocked()) { | |
kenrb
2016/12/22 15:14:16
You need to transform the event's coordinates into
lfg
2017/02/13 20:16:07
Done. I don't think we need to null check GetView(
kenrb
2017/02/14 19:58:49
I don't think child frame RWHImpls necessarily get
lfg
2017/02/15 20:12:03
After further investigation, this isn't necessary.
| |
177 RenderWidgetHostImpl::From(root_view->GetRenderWidgetHost()) | |
178 ->delegate() | |
179 ->MouseLockWidget() | |
180 ->GetView() | |
181 ->ProcessMouseEvent(*event, latency); | |
182 return; | |
183 } | |
184 | |
176 RenderWidgetHostViewBase* target; | 185 RenderWidgetHostViewBase* target; |
177 gfx::Point transformed_point; | 186 gfx::Point transformed_point; |
178 const int mouse_button_modifiers = blink::WebInputEvent::LeftButtonDown | | 187 const int mouse_button_modifiers = blink::WebInputEvent::LeftButtonDown | |
179 blink::WebInputEvent::MiddleButtonDown | | 188 blink::WebInputEvent::MiddleButtonDown | |
180 blink::WebInputEvent::RightButtonDown; | 189 blink::WebInputEvent::RightButtonDown; |
181 if (mouse_capture_target_.target && | 190 if (mouse_capture_target_.target && |
182 event->type != blink::WebInputEvent::MouseDown && | 191 event->type != blink::WebInputEvent::MouseDown && |
183 (event->type == blink::WebInputEvent::MouseUp || | 192 (event->type == blink::WebInputEvent::MouseUp || |
184 event->modifiers & mouse_button_modifiers)) { | 193 event->modifiers & mouse_button_modifiers)) { |
185 target = mouse_capture_target_.target; | 194 target = mouse_capture_target_.target; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
240 | 249 |
241 event->x = transformed_point.x(); | 250 event->x = transformed_point.x(); |
242 event->y = transformed_point.y(); | 251 event->y = transformed_point.y(); |
243 target->ProcessMouseEvent(*event, latency); | 252 target->ProcessMouseEvent(*event, latency); |
244 } | 253 } |
245 | 254 |
246 void RenderWidgetHostInputEventRouter::RouteMouseWheelEvent( | 255 void RenderWidgetHostInputEventRouter::RouteMouseWheelEvent( |
247 RenderWidgetHostViewBase* root_view, | 256 RenderWidgetHostViewBase* root_view, |
248 blink::WebMouseWheelEvent* event, | 257 blink::WebMouseWheelEvent* event, |
249 const ui::LatencyInfo& latency) { | 258 const ui::LatencyInfo& latency) { |
259 if (root_view->IsMouseLocked()) { | |
kenrb
2016/12/22 15:14:16
Likewise for the transform.
lfg
2017/02/13 20:16:07
Done.
| |
260 RenderWidgetHostImpl::From(root_view->GetRenderWidgetHost()) | |
261 ->delegate() | |
262 ->MouseLockWidget() | |
263 ->GetView() | |
264 ->ProcessMouseEvent(*event, latency); | |
265 return; | |
266 } | |
267 | |
250 gfx::Point transformed_point; | 268 gfx::Point transformed_point; |
251 RenderWidgetHostViewBase* target = FindEventTarget( | 269 RenderWidgetHostViewBase* target = FindEventTarget( |
252 root_view, gfx::Point(event->x, event->y), &transformed_point); | 270 root_view, gfx::Point(event->x, event->y), &transformed_point); |
253 if (!target) | 271 if (!target) |
254 return; | 272 return; |
255 | 273 |
256 event->x = transformed_point.x(); | 274 event->x = transformed_point.x(); |
257 event->y = transformed_point.y(); | 275 event->y = transformed_point.y(); |
258 target->ProcessMouseWheelEvent(*event, latency); | 276 target->ProcessMouseWheelEvent(*event, latency); |
259 } | 277 } |
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
773 if (!touchpad_gesture_target_.target) | 791 if (!touchpad_gesture_target_.target) |
774 return; | 792 return; |
775 | 793 |
776 // TODO(mohsen): Add tests to check event location. | 794 // TODO(mohsen): Add tests to check event location. |
777 event->x += touchpad_gesture_target_.delta.x(); | 795 event->x += touchpad_gesture_target_.delta.x(); |
778 event->y += touchpad_gesture_target_.delta.y(); | 796 event->y += touchpad_gesture_target_.delta.y(); |
779 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency); | 797 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency); |
780 } | 798 } |
781 | 799 |
782 } // namespace content | 800 } // namespace content |
OLD | NEW |