| Index: ui/events/gesture_detection/gesture_config_helper_android.cc
|
| diff --git a/ui/events/gesture_detection/gesture_config_helper_android.cc b/ui/events/gesture_detection/gesture_config_helper_android.cc
|
| index 5b85d6a818d3ad2fadb5db033199f2289f66f0f9..0b23346bedaed0157a736a02f3297f1c40bd6279 100644
|
| --- a/ui/events/gesture_detection/gesture_config_helper_android.cc
|
| +++ b/ui/events/gesture_detection/gesture_config_helper_android.cc
|
| @@ -49,14 +49,13 @@ ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig(
|
| const gfx::Display& display) {
|
| ScaleGestureDetector::Config config;
|
|
|
| - config.gesture_detector_config = DefaultGestureDetectorConfig(display);
|
| - config.quick_scale_enabled = true;
|
| -
|
| const float px_to_dp = 1.f / display.device_scale_factor();
|
| + config.span_slop = ViewConfiguration::GetTouchSlopInPixels() * 2.f * px_to_dp;
|
| config.min_scaling_touch_major =
|
| ViewConfiguration::GetMinScalingTouchMajorInPixels() * px_to_dp;
|
| config.min_scaling_span =
|
| ViewConfiguration::GetMinScalingSpanInPixels() * px_to_dp;
|
| + config.min_pinch_update_span_delta = 0.f;
|
|
|
| return config;
|
| }
|
|
|