| 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/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/metrics/histogram_macros.h" | 8 #include "base/metrics/histogram_macros.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "ui/events/base_event_utils.h" | 10 #include "ui/events/base_event_utils.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && | 84 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && |
| 85 ui::WebInputEventTraits::CanCauseScroll( | 85 ui::WebInputEventTraits::CanCauseScroll( |
| 86 event_sent_for_gesture_ack_->event) && | 86 event_sent_for_gesture_ack_->event) && |
| 87 event_sent_for_gesture_ack_->event.resendingPluginId == -1 && | 87 event_sent_for_gesture_ack_->event.resendingPluginId == -1 && |
| 88 (scrolling_device_ == blink::WebGestureDeviceUninitialized || | 88 (scrolling_device_ == blink::WebGestureDeviceUninitialized || |
| 89 scrolling_device_ == blink::WebGestureDeviceTouchpad)) { | 89 scrolling_device_ == blink::WebGestureDeviceTouchpad)) { |
| 90 WebGestureEvent scroll_update( | 90 WebGestureEvent scroll_update( |
| 91 WebInputEvent::GestureScrollUpdate, WebInputEvent::NoModifiers, | 91 WebInputEvent::GestureScrollUpdate, WebInputEvent::NoModifiers, |
| 92 event_sent_for_gesture_ack_->event.timeStampSeconds()); | 92 event_sent_for_gesture_ack_->event.timeStampSeconds()); |
| 93 | 93 |
| 94 scroll_update.x = event_sent_for_gesture_ack_->event.x; | 94 scroll_update.x = event_sent_for_gesture_ack_->event.position.x; |
| 95 scroll_update.y = event_sent_for_gesture_ack_->event.y; | 95 scroll_update.y = event_sent_for_gesture_ack_->event.position.y; |
| 96 scroll_update.globalX = event_sent_for_gesture_ack_->event.globalX; | 96 scroll_update.globalX = event_sent_for_gesture_ack_->event.screenPosition.x; |
| 97 scroll_update.globalY = event_sent_for_gesture_ack_->event.globalY; | 97 scroll_update.globalY = event_sent_for_gesture_ack_->event.screenPosition.y; |
| 98 scroll_update.sourceDevice = blink::WebGestureDeviceTouchpad; | 98 scroll_update.sourceDevice = blink::WebGestureDeviceTouchpad; |
| 99 scroll_update.resendingPluginId = -1; | 99 scroll_update.resendingPluginId = -1; |
| 100 | 100 |
| 101 // Swap X & Y if Shift is down and when there is no horizontal movement. | 101 // Swap X & Y if Shift is down and when there is no horizontal movement. |
| 102 if ((event_sent_for_gesture_ack_->event.modifiers() & | 102 if ((event_sent_for_gesture_ack_->event.modifiers() & |
| 103 WebInputEvent::ShiftKey) != 0 && | 103 WebInputEvent::ShiftKey) != 0 && |
| 104 event_sent_for_gesture_ack_->event.deltaX == 0) { | 104 event_sent_for_gesture_ack_->event.deltaX == 0) { |
| 105 scroll_update.data.scrollUpdate.deltaX = | 105 scroll_update.data.scrollUpdate.deltaX = |
| 106 event_sent_for_gesture_ack_->event.deltaY; | 106 event_sent_for_gesture_ack_->event.deltaY; |
| 107 scroll_update.data.scrollUpdate.deltaY = | 107 scroll_update.data.scrollUpdate.deltaY = |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 scroll_begin.data.scrollBegin.deltaHintUnits = | 348 scroll_begin.data.scrollBegin.deltaHintUnits = |
| 349 gesture_update.data.scrollUpdate.deltaUnits; | 349 gesture_update.data.scrollUpdate.deltaUnits; |
| 350 | 350 |
| 351 needs_scroll_begin_ = false; | 351 needs_scroll_begin_ = false; |
| 352 needs_scroll_end_ = true; | 352 needs_scroll_end_ = true; |
| 353 client_->ForwardGestureEventWithLatencyInfo( | 353 client_->ForwardGestureEventWithLatencyInfo( |
| 354 scroll_begin, ui::LatencyInfo(ui::SourceEventType::WHEEL)); | 354 scroll_begin, ui::LatencyInfo(ui::SourceEventType::WHEEL)); |
| 355 } | 355 } |
| 356 | 356 |
| 357 } // namespace content | 357 } // namespace content |
| OLD | NEW |