summaryrefslogtreecommitdiffstats
path: root/ui/events/gestures
diff options
context:
space:
mode:
authorlanwei <lanwei@chromium.org>2014-09-15 19:09:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-16 02:11:55 +0000
commita2349a8f0fa116ff0794d48fefc0074312b2f126 (patch)
tree34c6f993673824ee23ff080ea548c916f09b7746 /ui/events/gestures
parenta7e3c07f4bfada5410b7f5d06263dc5aafae98d9 (diff)
downloadchromium_src-a2349a8f0fa116ff0794d48fefc0074312b2f126.zip
chromium_src-a2349a8f0fa116ff0794d48fefc0074312b2f126.tar.gz
chromium_src-a2349a8f0fa116ff0794d48fefc0074312b2f126.tar.bz2
Remove unsupported parameters by the unified gesture detector from Gesture Configuration.
There are some parameters in the Gesture Configuration which are no longer used for unified gesture detector: max_radius_; min_flick_speed_squared_ min_rail_break_velocity_ min_scroll_delta_squared_ min_touch_down_duration_in_seconds_for_click_ rail_break_proportion_ rail_start_proportion_ scroll_prediction_seconds_ points_buffered_for_velocity_ BUG=380131 Review URL: https://codereview.chromium.org/570633002 Cr-Commit-Position: refs/heads/master@{#294975}
Diffstat (limited to 'ui/events/gestures')
-rw-r--r--ui/events/gestures/gesture_configuration.cc13
-rw-r--r--ui/events/gestures/gesture_configuration.h67
2 files changed, 0 insertions, 80 deletions
diff --git a/ui/events/gestures/gesture_configuration.cc b/ui/events/gestures/gesture_configuration.cc
index 5b22639..dd6188d 100644
--- a/ui/events/gestures/gesture_configuration.cc
+++ b/ui/events/gestures/gesture_configuration.cc
@@ -14,7 +14,6 @@ int GestureConfiguration::tab_scrub_activation_delay_in_ms_ = 200;
double GestureConfiguration::long_press_time_in_seconds_ = 1.0;
double GestureConfiguration::semi_long_press_time_in_seconds_ = 0.4;
double GestureConfiguration::max_distance_for_two_finger_tap_in_pixels_ = 300;
-int GestureConfiguration::max_radius_ = 100;
double GestureConfiguration::max_seconds_between_double_click_ = 0.7;
double
GestureConfiguration::max_separation_for_gesture_touches_in_pixels_ = 150;
@@ -24,25 +23,13 @@ double
double GestureConfiguration::max_touch_move_in_pixels_for_click_ = 15;
double GestureConfiguration::max_distance_between_taps_for_double_tap_ = 20;
double GestureConfiguration::min_distance_for_pinch_scroll_in_pixels_ = 20;
-double GestureConfiguration::min_flick_speed_squared_ = 550.f * 550.f;
double GestureConfiguration::min_pinch_update_distance_in_pixels_ = 5;
-double GestureConfiguration::min_rail_break_velocity_ = 200;
-double GestureConfiguration::min_scroll_delta_squared_ = 4 * 4;
float GestureConfiguration::min_scroll_velocity_ = 30.0f;
double GestureConfiguration::min_swipe_speed_ = 20;
-double GestureConfiguration::scroll_prediction_seconds_ = 0.03;
-double
- GestureConfiguration::min_touch_down_duration_in_seconds_for_click_ = 0.01;
// If this is too small, we currently can get single finger pinch zoom. See
// crbug.com/357237 for details.
int GestureConfiguration::min_scaling_span_in_pixels_ = 125;
-
-// The number of points used in the linear regression which determines
-// touch velocity. Velocity is reported for 2 or more touch move events.
-int GestureConfiguration::points_buffered_for_velocity_ = 8;
-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
diff --git a/ui/events/gestures/gesture_configuration.h b/ui/events/gestures/gesture_configuration.h
index 81f3ae0..39b3054 100644
--- a/ui/events/gestures/gesture_configuration.h
+++ b/ui/events/gestures/gesture_configuration.h
@@ -50,9 +50,6 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
static void set_max_distance_for_two_finger_tap_in_pixels(double val) {
max_distance_for_two_finger_tap_in_pixels_ = val;
}
- static int max_radius() {
- return max_radius_;
- }
static void set_long_press_time_in_seconds(double val) {
long_press_time_in_seconds_ = val;
}
@@ -101,30 +98,12 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
static void set_min_distance_for_pinch_scroll_in_pixels(double val) {
min_distance_for_pinch_scroll_in_pixels_ = val;
}
- static double min_flick_speed_squared() {
- return min_flick_speed_squared_;
- }
- static void set_min_flick_speed_squared(double val) {
- min_flick_speed_squared_ = val;
- }
static double min_pinch_update_distance_in_pixels() {
return min_pinch_update_distance_in_pixels_;
}
static void set_min_pinch_update_distance_in_pixels(double val) {
min_pinch_update_distance_in_pixels_ = val;
}
- static double min_rail_break_velocity() {
- return min_rail_break_velocity_;
- }
- static void set_min_rail_break_velocity(double val) {
- min_rail_break_velocity_ = val;
- }
- static double min_scroll_delta_squared() {
- return min_scroll_delta_squared_;
- }
- static void set_min_scroll_delta_squared(double val) {
- min_scroll_delta_squared_ = val;
- }
static float min_scroll_velocity() {
return min_scroll_velocity_;
}
@@ -137,45 +116,12 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
static void set_min_swipe_speed(double val) {
min_swipe_speed_ = val;
}
- static double min_touch_down_duration_in_seconds_for_click() {
- return min_touch_down_duration_in_seconds_for_click_;
- }
- static void set_min_touch_down_duration_in_seconds_for_click(double val) {
- min_touch_down_duration_in_seconds_for_click_ = val;
- }
-
static int min_scaling_span_in_pixels() {
return min_scaling_span_in_pixels_;
};
-
static void set_min_scaling_span_in_pixels(int val) {
min_scaling_span_in_pixels_ = val;
}
-
- static int points_buffered_for_velocity() {
- return points_buffered_for_velocity_;
- }
- static void set_points_buffered_for_velocity(int val) {
- points_buffered_for_velocity_ = val;
- }
- static double rail_break_proportion() {
- return rail_break_proportion_;
- }
- static void set_rail_break_proportion(double val) {
- rail_break_proportion_ = val;
- }
- static double rail_start_proportion() {
- return rail_start_proportion_;
- }
- static void set_rail_start_proportion(double val) {
- rail_start_proportion_ = val;
- }
- static double scroll_prediction_seconds() {
- return scroll_prediction_seconds_;
- }
- static void set_scroll_prediction_seconds(double val) {
- scroll_prediction_seconds_ = val;
- }
static int show_press_delay_in_ms() {
return show_press_delay_in_ms_;
}
@@ -222,10 +168,6 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
// recognize a two finger tap.
static double max_distance_for_two_finger_tap_in_pixels_;
- // The maximum allowed size for the radius of a touch region used in
- // forming an ET_GESTURE_TAP event.
- static int max_radius_;
-
// Maximum time between a GestureFlingCancel and a mousedown such that the
// mousedown is considered associated with the cancel event.
static int fling_max_cancel_to_down_time_in_ms_;
@@ -243,22 +185,13 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
static double max_touch_move_in_pixels_for_click_;
static double max_distance_between_taps_for_double_tap_;
static double min_distance_for_pinch_scroll_in_pixels_;
- static double min_flick_speed_squared_;
// Only used with --compensate-for-unstable-pinch-zoom.
static double min_pinch_update_distance_in_pixels_;
- static double min_rail_break_velocity_;
- static double min_scroll_delta_squared_;
static float min_scroll_velocity_;
static double min_swipe_speed_;
- static double min_touch_down_duration_in_seconds_for_click_;
static int min_scaling_span_in_pixels_;
- static int points_buffered_for_velocity_;
- static double rail_break_proportion_;
- 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.