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 16 matching lines...) Expand all Loading... |
27 event->touches[i].position.y += delta.y(); | 27 event->touches[i].position.y += delta.y(); |
28 } | 28 } |
29 } | 29 } |
30 | 30 |
31 blink::WebGestureEvent DummyGestureScrollUpdate() { | 31 blink::WebGestureEvent DummyGestureScrollUpdate() { |
32 blink::WebGestureEvent dummy_gesture_scroll_update; | 32 blink::WebGestureEvent dummy_gesture_scroll_update; |
33 dummy_gesture_scroll_update.type = blink::WebInputEvent::GestureScrollUpdate; | 33 dummy_gesture_scroll_update.type = blink::WebInputEvent::GestureScrollUpdate; |
34 return dummy_gesture_scroll_update; | 34 return dummy_gesture_scroll_update; |
35 } | 35 } |
36 | 36 |
| 37 bool IsGesturePinchEvent(const blink::WebGestureEvent* event) { |
| 38 return event->type == blink::WebInputEvent::GesturePinchBegin || |
| 39 event->type == blink::WebInputEvent::GesturePinchUpdate || |
| 40 event->type == blink::WebInputEvent::GesturePinchEnd; |
| 41 } |
| 42 |
37 } // anonymous namespace | 43 } // anonymous namespace |
38 | 44 |
39 namespace content { | 45 namespace content { |
40 | 46 |
41 void RenderWidgetHostInputEventRouter::OnRenderWidgetHostViewBaseDestroyed( | 47 void RenderWidgetHostInputEventRouter::OnRenderWidgetHostViewBaseDestroyed( |
42 RenderWidgetHostViewBase* view) { | 48 RenderWidgetHostViewBase* view) { |
43 view->RemoveObserver(this); | 49 view->RemoveObserver(this); |
44 | 50 |
45 // Remove this view from the owner_map. | 51 // Remove this view from the owner_map. |
46 for (auto entry : owner_map_) { | 52 for (auto entry : owner_map_) { |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
651 // should have been one. | 657 // should have been one. |
652 if (root_view != touchscreen_gesture_target_.target && | 658 if (root_view != touchscreen_gesture_target_.target && |
653 !rwhi->is_in_touchscreen_gesture_scroll()) { | 659 !rwhi->is_in_touchscreen_gesture_scroll()) { |
654 gesture_pinch_did_send_scroll_begin_ = true; | 660 gesture_pinch_did_send_scroll_begin_ = true; |
655 SendGestureScrollBegin(root_view, *event); | 661 SendGestureScrollBegin(root_view, *event); |
656 } | 662 } |
657 } | 663 } |
658 | 664 |
659 if (in_touchscreen_gesture_pinch_) { | 665 if (in_touchscreen_gesture_pinch_) { |
660 root_view->ProcessGestureEvent(*event, latency); | 666 root_view->ProcessGestureEvent(*event, latency); |
| 667 if (IsGesturePinchEvent(event)) { |
| 668 // Broadcast the pinch events to all subframes so they can update their |
| 669 // PageScales with the deltas in the events. We don't broadcast to |
| 670 // RenderWidgetHostViewGuest as it has a separate mechanism for |
| 671 // propagating page scale. |
| 672 for (auto entry : owner_map_) { |
| 673 if (entry.second != root_view && |
| 674 !entry.second->IsRenderWidgetHostViewGuest()) { |
| 675 entry.second->ProcessGestureEvent(*event, latency); |
| 676 } |
| 677 } |
| 678 } |
| 679 |
661 if (event->type == blink::WebInputEvent::GesturePinchEnd) { | 680 if (event->type == blink::WebInputEvent::GesturePinchEnd) { |
662 in_touchscreen_gesture_pinch_ = false; | 681 in_touchscreen_gesture_pinch_ = false; |
663 // If the root view wasn't already receiving the gesture stream, then we | 682 // If the root view wasn't already receiving the gesture stream, then we |
664 // need to wrap the diverted pinch events in a GestureScrollBegin/End. | 683 // need to wrap the diverted pinch events in a GestureScrollBegin/End. |
665 auto rwhi = | 684 auto rwhi = |
666 static_cast<RenderWidgetHostImpl*>(root_view->GetRenderWidgetHost()); | 685 static_cast<RenderWidgetHostImpl*>(root_view->GetRenderWidgetHost()); |
667 if (root_view != touchscreen_gesture_target_.target && | 686 if (root_view != touchscreen_gesture_target_.target && |
668 gesture_pinch_did_send_scroll_begin_ && | 687 gesture_pinch_did_send_scroll_begin_ && |
669 rwhi->is_in_touchscreen_gesture_scroll()) { | 688 rwhi->is_in_touchscreen_gesture_scroll()) { |
670 SendGestureScrollEnd(root_view, *event); | 689 SendGestureScrollEnd(root_view, *event); |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 if (!touchpad_gesture_target_.target) | 767 if (!touchpad_gesture_target_.target) |
749 return; | 768 return; |
750 | 769 |
751 // TODO(mohsen): Add tests to check event location. | 770 // TODO(mohsen): Add tests to check event location. |
752 event->x += touchpad_gesture_target_.delta.x(); | 771 event->x += touchpad_gesture_target_.delta.x(); |
753 event->y += touchpad_gesture_target_.delta.y(); | 772 event->y += touchpad_gesture_target_.delta.y(); |
754 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency); | 773 touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency); |
755 } | 774 } |
756 | 775 |
757 } // namespace content | 776 } // namespace content |
OLD | NEW |