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