| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/input/input_router_config_helper.h" | 5 #include "content/browser/renderer_host/input/input_router_config_helper.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
| 9 #include "ui/events/gesture_detection/gesture_detector.h" | 9 #include "ui/events/gesture_detection/gesture_detector.h" |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 config.debounce_interval = base::TimeDelta::FromMilliseconds( | 26 config.debounce_interval = base::TimeDelta::FromMilliseconds( |
| 27 ui::GestureConfiguration::scroll_debounce_interval_in_ms()); | 27 ui::GestureConfiguration::scroll_debounce_interval_in_ms()); |
| 28 | 28 |
| 29 config.touchscreen_tap_suppression_config.enabled = true; | 29 config.touchscreen_tap_suppression_config.enabled = true; |
| 30 config.touchscreen_tap_suppression_config.max_cancel_to_down_time = | 30 config.touchscreen_tap_suppression_config.max_cancel_to_down_time = |
| 31 base::TimeDelta::FromMilliseconds( | 31 base::TimeDelta::FromMilliseconds( |
| 32 ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms()); | 32 ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms()); |
| 33 | 33 |
| 34 config.touchscreen_tap_suppression_config.max_tap_gap_time = | 34 config.touchscreen_tap_suppression_config.max_tap_gap_time = |
| 35 base::TimeDelta::FromMilliseconds(static_cast<int>( | 35 base::TimeDelta::FromMilliseconds( |
| 36 ui::GestureConfiguration::semi_long_press_time_in_seconds() * 1000)); | 36 ui::GestureConfiguration::semi_long_press_time_in_ms()); |
| 37 | 37 |
| 38 config.touchpad_tap_suppression_config.enabled = true; | 38 config.touchpad_tap_suppression_config.enabled = true; |
| 39 config.touchpad_tap_suppression_config.max_cancel_to_down_time = | 39 config.touchpad_tap_suppression_config.max_cancel_to_down_time = |
| 40 base::TimeDelta::FromMilliseconds( | 40 base::TimeDelta::FromMilliseconds( |
| 41 ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms()); | 41 ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms()); |
| 42 | 42 |
| 43 config.touchpad_tap_suppression_config.max_tap_gap_time = | 43 config.touchpad_tap_suppression_config.max_tap_gap_time = |
| 44 base::TimeDelta::FromMilliseconds(static_cast<int>( | 44 base::TimeDelta::FromMilliseconds( |
| 45 ui::GestureConfiguration::fling_max_tap_gap_time_in_ms() * 1000)); | 45 ui::GestureConfiguration::fling_max_tap_gap_time_in_ms()); |
| 46 | 46 |
| 47 return config; | 47 return config; |
| 48 } | 48 } |
| 49 | 49 |
| 50 TouchEventQueue::Config GetTouchEventQueueConfig() { | 50 TouchEventQueue::Config GetTouchEventQueueConfig() { |
| 51 TouchEventQueue::Config config; | 51 TouchEventQueue::Config config; |
| 52 | 52 |
| 53 config.touchmove_slop_suppression_length_dips = | 53 config.touchmove_slop_suppression_length_dips = |
| 54 ui::GestureConfiguration::max_touch_move_in_pixels_for_click(); | 54 ui::GestureConfiguration::max_touch_move_in_pixels_for_click(); |
| 55 | 55 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 127 |
| 128 InputRouterImpl::Config GetInputRouterConfigForPlatform() { | 128 InputRouterImpl::Config GetInputRouterConfigForPlatform() { |
| 129 InputRouterImpl::Config config; | 129 InputRouterImpl::Config config; |
| 130 config.gesture_config = GetGestureEventQueueConfig(); | 130 config.gesture_config = GetGestureEventQueueConfig(); |
| 131 config.touch_config = GetTouchEventQueueConfig(); | 131 config.touch_config = GetTouchEventQueueConfig(); |
| 132 config.touch_config.touch_scrolling_mode = GetTouchScrollingMode(); | 132 config.touch_config.touch_scrolling_mode = GetTouchScrollingMode(); |
| 133 return config; | 133 return config; |
| 134 } | 134 } |
| 135 | 135 |
| 136 } // namespace content | 136 } // namespace content |
| OLD | NEW |