| Index: content/browser/renderer_host/input/mouse_wheel_event_queue.h
|
| diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.h b/content/browser/renderer_host/input/mouse_wheel_event_queue.h
|
| index a2722310b74b68c0c7e5c3f261851c65a969432d..f4d1ad75f9dc72076824893651b78f04d0957171 100644
|
| --- a/content/browser/renderer_host/input/mouse_wheel_event_queue.h
|
| +++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.h
|
| @@ -17,9 +17,7 @@ namespace content {
|
|
|
| // The duration in which a ScrollEnd will be sent after the last
|
| // ScrollUpdate was sent for wheel based gesture scrolls.
|
| -// Set the default wheel transaction to 0ms until
|
| -// crbug.com/526463 is fully implemented.
|
| -const int64_t kDefaultWheelScrollTransactionMs = 0; // 100;
|
| +const int64_t kDefaultWheelScrollLatchingTransactionMs = 100;
|
|
|
| class QueuedWebMouseWheelEvent;
|
|
|
| @@ -47,7 +45,7 @@ class CONTENT_EXPORT MouseWheelEventQueue {
|
| // |scroll_transaction_ms| is the duration in which the
|
| // ScrollEnd should be sent after a ScrollUpdate.
|
| MouseWheelEventQueue(MouseWheelEventQueueClient* client,
|
| - int64_t scroll_transaction_ms);
|
| + bool enable_scroll_latching);
|
|
|
| ~MouseWheelEventQueue();
|
|
|
| @@ -97,6 +95,9 @@ class CONTENT_EXPORT MouseWheelEventQueue {
|
| // GSB has been sent in the past.
|
| bool needs_scroll_end_;
|
|
|
| + // True if the touchpad and wheel scroll latching is enabled.
|
| + bool enable_scroll_latching_;
|
| +
|
| int64_t scroll_transaction_ms_;
|
| blink::WebGestureDevice scrolling_device_;
|
|
|
|
|