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

Side by Side Diff: ui/events/gestures/gesture_sequence.cc

Issue 140253005: Add touch scrolling modes experimental flags (DEPRECATED) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address my own nits. Created 6 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/events/gestures/gesture_sequence.h" 5 #include "ui/events/gestures/gesture_sequence.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 #include <cmath> 8 #include <cmath>
9 #include <limits> 9 #include <limits>
10 10
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED = 132 GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED =
133 G(GS_SYNTHETIC_CLICK_ABORTED, 0, TS_RELEASED, TSI_ALWAYS), 133 G(GS_SYNTHETIC_CLICK_ABORTED, 0, TS_RELEASED, TSI_ALWAYS),
134 134
135 GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED = 135 GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED =
136 G(GS_SYNTHETIC_CLICK_ABORTED, 1, TS_PRESSED, TSI_NOT_PROCESSED), 136 G(GS_SYNTHETIC_CLICK_ABORTED, 1, TS_PRESSED, TSI_NOT_PROCESSED),
137 137
138 GST_SCROLL_FIRST_RELEASED = 138 GST_SCROLL_FIRST_RELEASED =
139 G(GS_SCROLL, 0, TS_RELEASED, TSI_ALWAYS), 139 G(GS_SCROLL, 0, TS_RELEASED, TSI_ALWAYS),
140 140
141 // Once scroll has started, process all touch-move events.
142 GST_SCROLL_FIRST_MOVED = 141 GST_SCROLL_FIRST_MOVED =
143 G(GS_SCROLL, 0, TS_MOVED, TSI_ALWAYS), 142 G(GS_SCROLL, 0, TS_MOVED, TSI_NOT_PROCESSED),
143
144 GST_SCROLL_FIRST_MOVED_HANDLED =
145 G(GS_SCROLL, 0, TS_MOVED, TSI_PROCESSED),
144 146
145 GST_SCROLL_FIRST_CANCELLED = 147 GST_SCROLL_FIRST_CANCELLED =
146 G(GS_SCROLL, 0, TS_CANCELLED, TSI_ALWAYS), 148 G(GS_SCROLL, 0, TS_CANCELLED, TSI_ALWAYS),
147 149
148 GST_SCROLL_SECOND_PRESSED = 150 GST_SCROLL_SECOND_PRESSED =
149 G(GS_SCROLL, 1, TS_PRESSED, TSI_NOT_PROCESSED), 151 G(GS_SCROLL, 1, TS_PRESSED, TSI_NOT_PROCESSED),
150 152
151 GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED = 153 GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED =
152 G(GS_PENDING_TWO_FINGER_TAP, 0, TS_RELEASED, TSI_NOT_PROCESSED), 154 G(GS_PENDING_TWO_FINGER_TAP, 0, TS_RELEASED, TSI_NOT_PROCESSED),
153 155
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_RELEASED: 347 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_RELEASED:
346 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_RELEASED_HANDLED: 348 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_RELEASED_HANDLED:
347 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_MOVED: 349 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_MOVED:
348 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_STATIONARY: 350 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_STATIONARY:
349 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_CANCELLED: 351 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_CANCELLED:
350 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_SECOND_PRESSED: 352 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_SECOND_PRESSED:
351 case GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED: 353 case GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED:
352 case GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED: 354 case GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED:
353 case GST_SCROLL_FIRST_RELEASED: 355 case GST_SCROLL_FIRST_RELEASED:
354 case GST_SCROLL_FIRST_MOVED: 356 case GST_SCROLL_FIRST_MOVED:
357 case GST_SCROLL_FIRST_MOVED_HANDLED:
355 case GST_SCROLL_FIRST_CANCELLED: 358 case GST_SCROLL_FIRST_CANCELLED:
356 case GST_SCROLL_SECOND_PRESSED: 359 case GST_SCROLL_SECOND_PRESSED:
357 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED: 360 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED:
358 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED: 361 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED:
359 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED: 362 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED:
360 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED: 363 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED:
361 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED: 364 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED:
362 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED: 365 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED:
363 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED_HANDLED: 366 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED_HANDLED:
364 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED_HANDLED: 367 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED_HANDLED:
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 case GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED: 614 case GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED:
612 set_state(GS_NO_GESTURE); 615 set_state(GS_NO_GESTURE);
613 break; 616 break;
614 case GST_SCROLL_FIRST_MOVED: 617 case GST_SCROLL_FIRST_MOVED:
615 if (scroll_type_ == ST_VERTICAL || 618 if (scroll_type_ == ST_VERTICAL ||
616 scroll_type_ == ST_HORIZONTAL) 619 scroll_type_ == ST_HORIZONTAL)
617 BreakRailScroll(event, point, gestures.get()); 620 BreakRailScroll(event, point, gestures.get());
618 if (ScrollUpdate(event, point, gestures.get(), FS_NOT_FIRST_SCROLL)) 621 if (ScrollUpdate(event, point, gestures.get(), FS_NOT_FIRST_SCROLL))
619 point.UpdateForScroll(); 622 point.UpdateForScroll();
620 break; 623 break;
624 case GST_SCROLL_FIRST_MOVED_HANDLED:
625 break;
621 case GST_SCROLL_FIRST_RELEASED: 626 case GST_SCROLL_FIRST_RELEASED:
622 case GST_SCROLL_FIRST_CANCELLED: 627 case GST_SCROLL_FIRST_CANCELLED:
623 ScrollEnd(event, point, gestures.get()); 628 ScrollEnd(event, point, gestures.get());
624 set_state(GS_NO_GESTURE); 629 set_state(GS_NO_GESTURE);
625 break; 630 break;
626 case GST_PENDING_SYNTHETIC_CLICK_SECOND_PRESSED: 631 case GST_PENDING_SYNTHETIC_CLICK_SECOND_PRESSED:
627 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_SECOND_PRESSED: 632 case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_SECOND_PRESSED:
628 PrependTapCancelGestureEvent(point, gestures.get()); 633 PrependTapCancelGestureEvent(point, gestures.get());
629 TwoFingerTapOrPinch(event, point, gestures.get()); 634 TwoFingerTapOrPinch(event, point, gestures.get());
630 break; 635 break;
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 1483
1479 // Since a timer is running, there should be a non-NULL point. 1484 // Since a timer is running, there should be a non-NULL point.
1480 const GesturePoint* point = GetPointByPointId(0); 1485 const GesturePoint* point = GetPointByPointId(0);
1481 if (!point->IsInsideTouchSlopRegion(event)) { 1486 if (!point->IsInsideTouchSlopRegion(event)) {
1482 GetLongPressTimer()->Stop(); 1487 GetLongPressTimer()->Stop();
1483 GetShowPressTimer()->Stop(); 1488 GetShowPressTimer()->Stop();
1484 } 1489 }
1485 } 1490 }
1486 1491
1487 } // namespace ui 1492 } // namespace ui
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698