OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/input/mouse_wheel_event_queue.h" | 5 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" |
6 | 6 |
7 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
10 #include "content/common/input/web_input_event_traits.h" | 10 #include "ui/events/blink/web_input_event_traits.h" |
11 | 11 |
12 using blink::WebGestureEvent; | 12 using blink::WebGestureEvent; |
13 using blink::WebInputEvent; | 13 using blink::WebInputEvent; |
14 using blink::WebMouseWheelEvent; | 14 using blink::WebMouseWheelEvent; |
15 using ui::LatencyInfo; | 15 using ui::LatencyInfo; |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 | 18 |
19 // This class represents a single queued mouse wheel event. Its main use | 19 // This class represents a single queued mouse wheel event. Its main use |
20 // is that it is reported via trace events. | 20 // is that it is reported via trace events. |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 const LatencyInfo& latency_info) { | 76 const LatencyInfo& latency_info) { |
77 TRACE_EVENT0("input", "MouseWheelEventQueue::ProcessMouseWheelAck"); | 77 TRACE_EVENT0("input", "MouseWheelEventQueue::ProcessMouseWheelAck"); |
78 if (!event_sent_for_gesture_ack_) | 78 if (!event_sent_for_gesture_ack_) |
79 return; | 79 return; |
80 | 80 |
81 event_sent_for_gesture_ack_->latency.AddNewLatencyFrom(latency_info); | 81 event_sent_for_gesture_ack_->latency.AddNewLatencyFrom(latency_info); |
82 client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result); | 82 client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result); |
83 | 83 |
84 // If event wasn't consumed then generate a gesture scroll for it. | 84 // If event wasn't consumed then generate a gesture scroll for it. |
85 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && | 85 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && |
86 WebInputEventTraits::CanCauseScroll(event_sent_for_gesture_ack_->event) && | 86 ui::WebInputEventTraits::CanCauseScroll( |
| 87 event_sent_for_gesture_ack_->event) && |
87 event_sent_for_gesture_ack_->event.resendingPluginId == -1 && | 88 event_sent_for_gesture_ack_->event.resendingPluginId == -1 && |
88 (scrolling_device_ == blink::WebGestureDeviceUninitialized || | 89 (scrolling_device_ == blink::WebGestureDeviceUninitialized || |
89 scrolling_device_ == blink::WebGestureDeviceTouchpad)) { | 90 scrolling_device_ == blink::WebGestureDeviceTouchpad)) { |
90 WebGestureEvent scroll_update; | 91 WebGestureEvent scroll_update; |
91 scroll_update.timeStampSeconds = | 92 scroll_update.timeStampSeconds = |
92 event_sent_for_gesture_ack_->event.timeStampSeconds; | 93 event_sent_for_gesture_ack_->event.timeStampSeconds; |
93 | 94 |
94 scroll_update.x = event_sent_for_gesture_ack_->event.x; | 95 scroll_update.x = event_sent_for_gesture_ack_->event.x; |
95 scroll_update.y = event_sent_for_gesture_ack_->event.y; | 96 scroll_update.y = event_sent_for_gesture_ack_->event.y; |
96 scroll_update.globalX = event_sent_for_gesture_ack_->event.globalX; | 97 scroll_update.globalX = event_sent_for_gesture_ack_->event.globalX; |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 scroll_begin.data.scrollBegin.targetViewport = false; | 287 scroll_begin.data.scrollBegin.targetViewport = false; |
287 scroll_begin.data.scrollBegin.deltaHintUnits = | 288 scroll_begin.data.scrollBegin.deltaHintUnits = |
288 gesture_update.data.scrollUpdate.deltaUnits; | 289 gesture_update.data.scrollUpdate.deltaUnits; |
289 | 290 |
290 needs_scroll_begin_ = false; | 291 needs_scroll_begin_ = false; |
291 needs_scroll_end_ = true; | 292 needs_scroll_end_ = true; |
292 client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo()); | 293 client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo()); |
293 } | 294 } |
294 | 295 |
295 } // namespace content | 296 } // namespace content |
OLD | NEW |