Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Side by Side Diff: content/browser/renderer_host/input/gesture_event_queue.cc

Issue 2542453003: Suppress LongPress/Tap, and TwoFingerTap when TapDown cancels a fling. (Closed)
Patch Set: clarification comments added. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/input/input_router_config_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/gesture_event_queue.h" 5 #include "content/browser/renderer_host/input/gesture_event_queue.h"
6 6
7 #include "base/trace_event/trace_event.h" 7 #include "base/trace_event/trace_event.h"
8 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle r.h" 8 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle r.h"
9 #include "content/browser/renderer_host/input/touchscreen_tap_suppression_contro ller.h" 9 #include "content/browser/renderer_host/input/touchscreen_tap_suppression_contro ller.h"
10 #include "ui/events/blink/web_input_event_traits.h" 10 #include "ui/events/blink/web_input_event_traits.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 touchscreen_tap_suppression_controller_.GestureFlingCancel(); 156 touchscreen_tap_suppression_controller_.GestureFlingCancel();
157 else 157 else
158 touchpad_tap_suppression_controller_.GestureFlingCancel(); 158 touchpad_tap_suppression_controller_.GestureFlingCancel();
159 return true; 159 return true;
160 case WebInputEvent::GestureTapDown: 160 case WebInputEvent::GestureTapDown:
161 case WebInputEvent::GestureShowPress: 161 case WebInputEvent::GestureShowPress:
162 case WebInputEvent::GestureTapUnconfirmed: 162 case WebInputEvent::GestureTapUnconfirmed:
163 case WebInputEvent::GestureTapCancel: 163 case WebInputEvent::GestureTapCancel:
164 case WebInputEvent::GestureTap: 164 case WebInputEvent::GestureTap:
165 case WebInputEvent::GestureDoubleTap: 165 case WebInputEvent::GestureDoubleTap:
166 case WebInputEvent::GestureLongPress:
167 case WebInputEvent::GestureLongTap:
168 case WebInputEvent::GestureTwoFingerTap:
166 if (gesture_event.event.sourceDevice == 169 if (gesture_event.event.sourceDevice ==
167 blink::WebGestureDeviceTouchscreen) { 170 blink::WebGestureDeviceTouchscreen) {
168 return !touchscreen_tap_suppression_controller_.FilterTapEvent( 171 return !touchscreen_tap_suppression_controller_.FilterTapEvent(
169 gesture_event); 172 gesture_event);
170 } 173 }
171 return true; 174 return true;
172 default: 175 default:
173 return true; 176 return true;
174 } 177 }
175 } 178 }
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 return 0; 414 return 0;
412 415
413 if (!ignore_next_ack_) 416 if (!ignore_next_ack_)
414 return 1; 417 return 1;
415 418
416 DCHECK_GT(coalesced_gesture_events_.size(), 1U); 419 DCHECK_GT(coalesced_gesture_events_.size(), 1U);
417 return 2; 420 return 2;
418 } 421 }
419 422
420 } // namespace content 423 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/input/input_router_config_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698