| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 const LatencyInfo& latency_info) { | 74 const LatencyInfo& latency_info) { |
| 75 TRACE_EVENT0("input", "MouseWheelEventQueue::ProcessMouseWheelAck"); | 75 TRACE_EVENT0("input", "MouseWheelEventQueue::ProcessMouseWheelAck"); |
| 76 if (!event_sent_for_gesture_ack_) | 76 if (!event_sent_for_gesture_ack_) |
| 77 return; | 77 return; |
| 78 | 78 |
| 79 event_sent_for_gesture_ack_->latency.AddNewLatencyFrom(latency_info); | 79 event_sent_for_gesture_ack_->latency.AddNewLatencyFrom(latency_info); |
| 80 client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result); | 80 client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result); |
| 81 | 81 |
| 82 // If event wasn't consumed then generate a gesture scroll for it. | 82 // If event wasn't consumed then generate a gesture scroll for it. |
| 83 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && | 83 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && |
| 84 WebInputEventTraits::CanCauseScroll(event_sent_for_gesture_ack_->event) && | 84 ui::WebInputEventTraits::CanCauseScroll( |
| 85 event_sent_for_gesture_ack_->event) && |
| 85 event_sent_for_gesture_ack_->event.resendingPluginId == -1 && | 86 event_sent_for_gesture_ack_->event.resendingPluginId == -1 && |
| 86 (scrolling_device_ == blink::WebGestureDeviceUninitialized || | 87 (scrolling_device_ == blink::WebGestureDeviceUninitialized || |
| 87 scrolling_device_ == blink::WebGestureDeviceTouchpad)) { | 88 scrolling_device_ == blink::WebGestureDeviceTouchpad)) { |
| 88 WebGestureEvent scroll_update; | 89 WebGestureEvent scroll_update; |
| 89 scroll_update.timeStampSeconds = | 90 scroll_update.timeStampSeconds = |
| 90 event_sent_for_gesture_ack_->event.timeStampSeconds; | 91 event_sent_for_gesture_ack_->event.timeStampSeconds; |
| 91 | 92 |
| 92 scroll_update.x = event_sent_for_gesture_ack_->event.x; | 93 scroll_update.x = event_sent_for_gesture_ack_->event.x; |
| 93 scroll_update.y = event_sent_for_gesture_ack_->event.y; | 94 scroll_update.y = event_sent_for_gesture_ack_->event.y; |
| 94 scroll_update.globalX = event_sent_for_gesture_ack_->event.globalX; | 95 scroll_update.globalX = event_sent_for_gesture_ack_->event.globalX; |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 scroll_begin.data.scrollBegin.targetViewport = false; | 285 scroll_begin.data.scrollBegin.targetViewport = false; |
| 285 scroll_begin.data.scrollBegin.deltaHintUnits = | 286 scroll_begin.data.scrollBegin.deltaHintUnits = |
| 286 gesture_update.data.scrollUpdate.deltaUnits; | 287 gesture_update.data.scrollUpdate.deltaUnits; |
| 287 | 288 |
| 288 needs_scroll_begin_ = false; | 289 needs_scroll_begin_ = false; |
| 289 needs_scroll_end_ = true; | 290 needs_scroll_end_ = true; |
| 290 client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo()); | 291 client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo()); |
| 291 } | 292 } |
| 292 | 293 |
| 293 } // namespace content | 294 } // namespace content |
| OLD | NEW |