diff options
| author | Sadrul Habib Chowdhury <sadrul@chromium.org> | 2014-09-25 01:11:11 -0400 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@chromium.org> | 2014-09-25 05:12:37 +0000 |
| commit | 67feaac651ac428654a7326db2c2329d52a78de3 (patch) | |
| tree | 1e47ed1d0ef2b263f3106d6adbea77ed8bcd0cbb /ui/events/gestures | |
| parent | 0e6cd43eb9a467c81382e37f686f3ebfdda5c1d3 (diff) | |
| download | chromium_src-67feaac651ac428654a7326db2c2329d52a78de3.zip chromium_src-67feaac651ac428654a7326db2c2329d52a78de3.tar.gz chromium_src-67feaac651ac428654a7326db2c2329d52a78de3.tar.bz2 | |
fling: Remove a bunch of code for configuring fling curves.
The fling curve for touchpad and touchscreen used to be configurable for
experimenting with, but these parameters have been stable for a long time now.
So make the values default, and remove all the code and preferences that were
necessary for the configurability.
BUG=none
R=avi@chromium.org, kenrb@chromium.org, sky@chromium.org, wjmaclean@chromium.org
Review URL: https://codereview.chromium.org/586933003
Cr-Commit-Position: refs/heads/master@{#296652}
Diffstat (limited to 'ui/events/gestures')
| -rw-r--r-- | ui/events/gestures/gesture_configuration.cc | 11 | ||||
| -rw-r--r-- | ui/events/gestures/gesture_configuration.h | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/ui/events/gestures/gesture_configuration.cc b/ui/events/gestures/gesture_configuration.cc index dd6188d..1ce13d7 100644 --- a/ui/events/gestures/gesture_configuration.cc +++ b/ui/events/gestures/gesture_configuration.cc @@ -40,15 +40,4 @@ int GestureConfiguration::scroll_debounce_interval_in_ms_ = 30; 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. -float GestureConfiguration::fling_acceleration_curve_coefficients_[ - NumAccelParams] = { - 0.0166667f, - -0.0238095f, - 0.0452381f, - 0.8f -}; - } // namespace ui diff --git a/ui/events/gestures/gesture_configuration.h b/ui/events/gestures/gesture_configuration.h index 39b3054..1537b8e 100644 --- a/ui/events/gestures/gesture_configuration.h +++ b/ui/events/gestures/gesture_configuration.h @@ -16,10 +16,6 @@ namespace ui { class EVENTS_BASE_EXPORT GestureConfiguration { public: - // Number of parameters in the array of parameters for the fling acceleration - // curve. - static const int NumAccelParams = 4; - // Ordered alphabetically ignoring underscores, to align with the // associated list of prefs in gesture_prefs_aura.cc. static int default_radius() { @@ -134,12 +130,6 @@ class EVENTS_BASE_EXPORT GestureConfiguration { 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; - } - static float fling_acceleration_curve_coefficients(int i) { - return fling_acceleration_curve_coefficients_[i]; - } static float fling_velocity_cap() { return fling_velocity_cap_; } @@ -192,7 +182,6 @@ class EVENTS_BASE_EXPORT GestureConfiguration { static int min_scaling_span_in_pixels_; 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. static int tab_scrub_activation_delay_in_ms_; |