summaryrefslogtreecommitdiffstats
path: root/ui/base/gestures
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base/gestures')
-rw-r--r--ui/base/gestures/gesture_configuration.cc2
-rw-r--r--ui/base/gestures/gesture_sequence.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/gestures/gesture_configuration.cc b/ui/base/gestures/gesture_configuration.cc
index a53685e..928f008 100644
--- a/ui/base/gestures/gesture_configuration.cc
+++ b/ui/base/gestures/gesture_configuration.cc
@@ -38,6 +38,6 @@ double GestureConfiguration::rail_start_proportion_ = 2;
// The additional acceleration to apply to touchscreen flings.
double GestureConfiguration::touchscreen_fling_acceleration_adjustment_
- = 1.f / 900.f;
+ = 1;
} // namespace ui
diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc
index 7760a0d..b4d324d 100644
--- a/ui/base/gestures/gesture_sequence.cc
+++ b/ui/base/gestures/gesture_sequence.cc
@@ -280,7 +280,7 @@ float CalibrateFlingVelocity(float velocity) {
// http://crbug.com/120154
const float velocity_scaling =
GestureConfiguration::touchscreen_fling_acceleration_adjustment();
- return velocity_scaling * velocity * fabsf(velocity);
+ return velocity_scaling * velocity;
}
} // namespace