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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 } | 93 } |
94 | 94 |
95 TouchEventQueue::Config GetTouchEventQueueConfig() { | 95 TouchEventQueue::Config GetTouchEventQueueConfig() { |
96 return TouchEventQueue::Config(); | 96 return TouchEventQueue::Config(); |
97 } | 97 } |
98 | 98 |
99 #endif | 99 #endif |
100 | 100 |
101 } // namespace | 101 } // namespace |
102 | 102 |
103 InputRouterImpl::Config GetInputRouterConfigForPlatform() { | 103 InputRouterImpl::Config GetInputRouterConfigForPlatform( |
| 104 bool has_browser_compositor) { |
104 InputRouterImpl::Config config; | 105 InputRouterImpl::Config config; |
105 config.gesture_config = GetGestureEventQueueConfig(); | 106 config.gesture_config = GetGestureEventQueueConfig(); |
| 107 #if defined(OS_ANDROID) |
| 108 config.gesture_config.touchscreen_tap_suppression_config.enabled &= |
| 109 has_browser_compositor; |
| 110 #endif |
106 config.touch_config = GetTouchEventQueueConfig(); | 111 config.touch_config = GetTouchEventQueueConfig(); |
| 112 // Disable tap suppression controller on Android WebView, because the WebView |
| 113 // app can customize fling/scroll, and never ticks the animation, thus |
| 114 // confusing tap suppression controller. |
107 return config; | 115 return config; |
108 } | 116 } |
109 | 117 |
110 } // namespace content | 118 } // namespace content |
OLD | NEW |