Chromium Code Reviews| 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 "content/common/input/web_input_event_traits.h" |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 }; | 34 }; |
| 35 | 35 |
| 36 MouseWheelEventQueue::MouseWheelEventQueue(MouseWheelEventQueueClient* client, | 36 MouseWheelEventQueue::MouseWheelEventQueue(MouseWheelEventQueueClient* client, |
| 37 int64_t scroll_transaction_ms) | 37 int64_t scroll_transaction_ms) |
| 38 : client_(client), | 38 : client_(client), |
| 39 needs_scroll_begin_(true), | 39 needs_scroll_begin_(true), |
| 40 needs_scroll_end_(false), | 40 needs_scroll_end_(false), |
| 41 scroll_transaction_ms_(scroll_transaction_ms), | 41 scroll_transaction_ms_(scroll_transaction_ms), |
| 42 scrolling_device_(blink::WebGestureDeviceUninitialized) { | 42 scrolling_device_(blink::WebGestureDeviceUninitialized) { |
| 43 DCHECK(client); | 43 DCHECK(client); |
| 44 touchpad_scroll_latching_ = | |
|
ericrk
2016/07/19 20:21:51
nit: it seems odd/fragile to set this variable bas
sahel
2016/07/19 22:47:03
Done.
| |
| 45 scroll_transaction_ms_ == kDefaultWheelScrollTransactionMs ? false : true; | |
| 44 } | 46 } |
| 45 | 47 |
| 46 MouseWheelEventQueue::~MouseWheelEventQueue() { | 48 MouseWheelEventQueue::~MouseWheelEventQueue() { |
| 47 if (!wheel_queue_.empty()) | 49 if (!wheel_queue_.empty()) |
| 48 STLDeleteElements(&wheel_queue_); | 50 STLDeleteElements(&wheel_queue_); |
| 49 } | 51 } |
| 50 | 52 |
| 51 void MouseWheelEventQueue::QueueEvent( | 53 void MouseWheelEventQueue::QueueEvent( |
| 52 const MouseWheelEventWithLatencyInfo& event) { | 54 const MouseWheelEventWithLatencyInfo& event) { |
| 53 TRACE_EVENT0("input", "MouseWheelEventQueue::QueueEvent"); | 55 TRACE_EVENT0("input", "MouseWheelEventQueue::QueueEvent"); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 // because the events generated will be a GSB (non-synthetic) and GSE | 164 // because the events generated will be a GSB (non-synthetic) and GSE |
| 163 // (non-synthetic). This situation arises when OSX generates double | 165 // (non-synthetic). This situation arises when OSX generates double |
| 164 // phase end information. | 166 // phase end information. |
| 165 bool empty_sequence = | 167 bool empty_sequence = |
| 166 !needs_update && needs_scroll_begin_ && current_phase_ended; | 168 !needs_update && needs_scroll_begin_ && current_phase_ended; |
| 167 | 169 |
| 168 if (needs_update || !empty_sequence) { | 170 if (needs_update || !empty_sequence) { |
| 169 if (needs_scroll_begin_) { | 171 if (needs_scroll_begin_) { |
| 170 // If no GSB has been sent, it will be a non-synthetic GSB. | 172 // If no GSB has been sent, it will be a non-synthetic GSB. |
| 171 SendScrollBegin(scroll_update, false); | 173 SendScrollBegin(scroll_update, false); |
| 172 } else if (has_phase_info) { | 174 } else if (has_phase_info && !touchpad_scroll_latching_) { |
| 173 // If a GSB has been sent, generate a synthetic GSB if we have phase | 175 // If a GSB has been sent, generate a synthetic GSB if we have phase |
| 174 // information. This should be removed once crbug.com/526463 is fully | 176 // information. This should be removed once crbug.com/526463 is fully |
| 175 // implemented. | 177 // implemented. |
| 176 SendScrollBegin(scroll_update, true); | 178 SendScrollBegin(scroll_update, true); |
| 177 } | 179 } |
| 178 | 180 |
| 179 if (needs_update) { | 181 if (needs_update) { |
| 180 ui::LatencyInfo latency = ui::LatencyInfo(); | 182 ui::LatencyInfo latency = ui::LatencyInfo(); |
| 181 latency.AddLatencyNumber( | 183 latency.AddLatencyNumber( |
| 182 ui::INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL, 0, | 184 ui::INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL, 0, |
| 183 0); | 185 0); |
| 184 client_->ForwardGestureEventWithLatencyInfo(scroll_update, latency); | 186 client_->ForwardGestureEventWithLatencyInfo(scroll_update, latency); |
| 185 } | 187 } |
| 186 | 188 |
| 187 if (current_phase_ended) { | 189 if (current_phase_ended) { |
| 188 // Non-synthetic GSEs are sent when the current phase is canceled or | 190 // Non-synthetic GSEs are sent when the current phase is canceled or |
| 189 // ended. | 191 // ended. |
| 190 SendScrollEnd(scroll_update, false); | 192 SendScrollEnd(scroll_update, false); |
| 191 } else if (has_phase_info) { | 193 } else if (has_phase_info) { |
| 192 // Generate a synthetic GSE for every update to force hit testing so | 194 // Generate a synthetic GSE for every update to force hit testing so |
| 193 // that the non-latching behavior is preserved. Remove once | 195 // that the non-latching behavior is preserved. Remove once |
| 194 // crbug.com/526463 is fully implemented. | 196 // crbug.com/526463 is fully implemented. |
| 195 SendScrollEnd(scroll_update, true); | 197 if (!touchpad_scroll_latching_) |
| 198 SendScrollEnd(scroll_update, true); | |
| 196 } else { | 199 } else { |
| 197 scroll_end_timer_.Start( | 200 scroll_end_timer_.Start( |
| 198 FROM_HERE, | 201 FROM_HERE, |
| 199 base::TimeDelta::FromMilliseconds(scroll_transaction_ms_), | 202 base::TimeDelta::FromMilliseconds(scroll_transaction_ms_), |
| 200 base::Bind(&MouseWheelEventQueue::SendScrollEnd, | 203 base::Bind(&MouseWheelEventQueue::SendScrollEnd, |
| 201 base::Unretained(this), scroll_update, false)); | 204 base::Unretained(this), scroll_update, false)); |
| 202 } | 205 } |
| 203 } | 206 } |
| 204 } | 207 } |
| 205 | 208 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 284 scroll_begin.data.scrollBegin.targetViewport = false; | 287 scroll_begin.data.scrollBegin.targetViewport = false; |
| 285 scroll_begin.data.scrollBegin.deltaHintUnits = | 288 scroll_begin.data.scrollBegin.deltaHintUnits = |
| 286 gesture_update.data.scrollUpdate.deltaUnits; | 289 gesture_update.data.scrollUpdate.deltaUnits; |
| 287 | 290 |
| 288 needs_scroll_begin_ = false; | 291 needs_scroll_begin_ = false; |
| 289 needs_scroll_end_ = true; | 292 needs_scroll_end_ = true; |
| 290 client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo()); | 293 client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo()); |
| 291 } | 294 } |
| 292 | 295 |
| 293 } // namespace content | 296 } // namespace content |
| OLD | NEW |