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 16 matching lines...) Expand all Loading... | |
27 | 27 |
28 ~QueuedWebMouseWheelEvent() { | 28 ~QueuedWebMouseWheelEvent() { |
29 TRACE_EVENT_ASYNC_END0("input", "MouseWheelEventQueue::QueueEvent", this); | 29 TRACE_EVENT_ASYNC_END0("input", "MouseWheelEventQueue::QueueEvent", this); |
30 } | 30 } |
31 | 31 |
32 private: | 32 private: |
33 DISALLOW_COPY_AND_ASSIGN(QueuedWebMouseWheelEvent); | 33 DISALLOW_COPY_AND_ASSIGN(QueuedWebMouseWheelEvent); |
34 }; | 34 }; |
35 | 35 |
36 MouseWheelEventQueue::MouseWheelEventQueue(MouseWheelEventQueueClient* client, | 36 MouseWheelEventQueue::MouseWheelEventQueue(MouseWheelEventQueueClient* client, |
37 int64_t scroll_transaction_ms) | 37 bool touchpad_scroll_latching) |
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 touchpad_scroll_latching_(touchpad_scroll_latching), |
nasko
2016/07/25 16:00:18
It doesn't seem this member variable is used anywh
sahel
2016/07/25 16:05:11
You are right, for now it is not used. But I am wo
| |
42 scrolling_device_(blink::WebGestureDeviceUninitialized) { | 42 scrolling_device_(blink::WebGestureDeviceUninitialized) { |
43 DCHECK(client); | 43 DCHECK(client); |
44 scroll_transaction_ms_ = touchpad_scroll_latching_ | |
tdresser
2016/07/25 16:46:55
The timeout is only for wheel, not touchpad, right
sahel
2016/07/25 17:58:26
Done.
| |
45 ? kDefaultWheelScrollLatchingTransactionMs | |
46 : kDefaultWheelScrollTransactionMs; | |
44 } | 47 } |
45 | 48 |
46 MouseWheelEventQueue::~MouseWheelEventQueue() { | 49 MouseWheelEventQueue::~MouseWheelEventQueue() { |
47 if (!wheel_queue_.empty()) | 50 if (!wheel_queue_.empty()) |
48 STLDeleteElements(&wheel_queue_); | 51 STLDeleteElements(&wheel_queue_); |
49 } | 52 } |
50 | 53 |
51 void MouseWheelEventQueue::QueueEvent( | 54 void MouseWheelEventQueue::QueueEvent( |
52 const MouseWheelEventWithLatencyInfo& event) { | 55 const MouseWheelEventWithLatencyInfo& event) { |
53 TRACE_EVENT0("input", "MouseWheelEventQueue::QueueEvent"); | 56 TRACE_EVENT0("input", "MouseWheelEventQueue::QueueEvent"); |
(...skipping 230 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 |