diff options
| author | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 10:38:01 +0000 |
|---|---|---|
| committer | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 10:38:01 +0000 |
| commit | 277857a4cfa3675d9e7cb85333ad6035a7643b36 (patch) | |
| tree | ec1bb64af7e4921cd7279e56d92938d8a5975506 /ui/events/gestures | |
| parent | 4adc127a9ca34a1b4059fcab8b69e8b140c77579 (diff) | |
| download | chromium_src-277857a4cfa3675d9e7cb85333ad6035a7643b36.zip chromium_src-277857a4cfa3675d9e7cb85333ad6035a7643b36.tar.gz chromium_src-277857a4cfa3675d9e7cb85333ad6035a7643b36.tar.bz2 | |
Move OverscrollController to RenderWidgetHostViewAura
OverscrollController is currently only used by Aura, and there are no plans to
adopt it on other platforms. As such, move it to RenderWidgetHostViewAura,
simplifying both RenderWidgetHostImpl and InputRouterImpl. This move should not
affect overscroll behavior on Aura (particularly, ChromeOS) in any way.
BUG=306133
Review URL: https://codereview.chromium.org/291003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/events/gestures')
| -rw-r--r-- | ui/events/gestures/gesture_configuration.cc | 8 | ||||
| -rw-r--r-- | ui/events/gestures/gesture_configuration.h | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ui/events/gestures/gesture_configuration.cc b/ui/events/gestures/gesture_configuration.cc index 5205280..8623e99 100644 --- a/ui/events/gestures/gesture_configuration.cc +++ b/ui/events/gestures/gesture_configuration.cc @@ -45,6 +45,14 @@ double GestureConfiguration::rail_break_proportion_ = 15; double GestureConfiguration::rail_start_proportion_ = 2; int GestureConfiguration::show_press_delay_in_ms_ = 150; +// TODO(jdduke): Disable and remove entirely when issues with intermittent +// scroll end detection on the Pixel are resolved, crbug.com/353702. +#if defined(OS_CHROMEOS) +int GestureConfiguration::scroll_debounce_interval_in_ms_ = 30; +#else +int GestureConfiguration::scroll_debounce_interval_in_ms_ = 0; +#endif + // Coefficients for a function that computes fling acceleration. // These are empirically determined defaults. Do not adjust without // additional empirical validation. diff --git a/ui/events/gestures/gesture_configuration.h b/ui/events/gestures/gesture_configuration.h index f121b75..08ce578 100644 --- a/ui/events/gestures/gesture_configuration.h +++ b/ui/events/gestures/gesture_configuration.h @@ -182,6 +182,12 @@ class EVENTS_BASE_EXPORT GestureConfiguration { static int set_show_press_delay_in_ms(int val) { return show_press_delay_in_ms_ = val; } + static int scroll_debounce_interval_in_ms() { + return scroll_debounce_interval_in_ms_; + } + static int set_scroll_debounce_interval_in_ms(int val) { + return scroll_debounce_interval_in_ms_ = val; + } static void set_fling_acceleration_curve_coefficients(int i, float val) { fling_acceleration_curve_coefficients_[i] = val; } @@ -250,6 +256,8 @@ class EVENTS_BASE_EXPORT GestureConfiguration { static double rail_start_proportion_; static double scroll_prediction_seconds_; static int show_press_delay_in_ms_; + static int scroll_debounce_interval_in_ms_; + static float fling_acceleration_curve_coefficients_[NumAccelParams]; static float fling_velocity_cap_; // TODO(davemoore): Move into chrome/browser/ui. |