Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 626 case GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED: | 626 case GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED: |
| 627 TwoFingerTapOrPinch(event, point, gestures.get()); | 627 TwoFingerTapOrPinch(event, point, gestures.get()); |
| 628 break; | 628 break; |
| 629 case GST_SCROLL_SECOND_PRESSED: | 629 case GST_SCROLL_SECOND_PRESSED: |
| 630 PinchStart(event, point, gestures.get()); | 630 PinchStart(event, point, gestures.get()); |
| 631 set_state(GS_PINCH); | 631 set_state(GS_PINCH); |
| 632 break; | 632 break; |
| 633 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED: | 633 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED: |
| 634 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED: | 634 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED: |
| 635 TwoFingerTouchReleased(event, point, gestures.get()); | 635 TwoFingerTouchReleased(event, point, gestures.get()); |
| 636 AppendScrollGestureBegin( | |
| 637 point, point.first_touch_position(), gestures.get()); | |
| 638 scroll_type_ = ST_FREE; | |
| 636 set_state(GS_SCROLL); | 639 set_state(GS_SCROLL); |
| 637 break; | 640 break; |
| 638 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED: | 641 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED: |
| 639 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED: | 642 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED: |
| 640 if (TwoFingerTouchMove(event, point, gestures.get())) | 643 if (TwoFingerTouchMove(event, point, gestures.get())) |
| 641 set_state(GS_PINCH); | 644 set_state(GS_PINCH); |
| 642 break; | 645 break; |
| 643 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED_HANDLED: | 646 case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED_HANDLED: |
| 644 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED_HANDLED: | 647 case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED_HANDLED: |
| 645 set_state(GS_PENDING_TWO_FINGER_TAP_NO_PINCH); | 648 set_state(GS_PENDING_TWO_FINGER_TAP_NO_PINCH); |
| 646 break; | 649 break; |
| 647 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED: | 650 case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED: |
| 648 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED: | 651 case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED: |
| 649 case GST_PENDING_TWO_FINGER_TAP_FIRST_CANCELLED: | 652 case GST_PENDING_TWO_FINGER_TAP_FIRST_CANCELLED: |
| 650 case GST_PENDING_TWO_FINGER_TAP_SECOND_CANCELLED: | 653 case GST_PENDING_TWO_FINGER_TAP_SECOND_CANCELLED: |
| 651 scroll_type_ = ST_FREE; | 654 scroll_type_ = ST_FREE; |
| 652 set_state(GS_SCROLL); | 655 set_state(GS_SCROLL); |
|
sadrul
2014/03/07 18:07:07
Do you need the same change here, and in lines ~66
tdresser
2014/03/07 19:23:27
Absolutely. Done.
| |
| 653 break; | 656 break; |
| 654 case GST_PENDING_TWO_FINGER_TAP_THIRD_PRESSED: | 657 case GST_PENDING_TWO_FINGER_TAP_THIRD_PRESSED: |
| 655 set_state(GS_PENDING_PINCH); | 658 set_state(GS_PENDING_PINCH); |
| 656 break; | 659 break; |
| 657 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_FIRST_MOVED: | 660 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_FIRST_MOVED: |
| 658 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_SECOND_MOVED: | 661 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_SECOND_MOVED: |
| 659 // No pinch allowed, so nothing happens. | 662 // No pinch allowed, so nothing happens. |
| 660 break; | 663 break; |
| 661 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_FIRST_RELEASED: | 664 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_FIRST_RELEASED: |
| 662 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_SECOND_RELEASED: | 665 case GST_PENDING_TWO_FINGER_TAP_NO_PINCH_SECOND_RELEASED: |
| (...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1473 | 1476 |
| 1474 // Since a timer is running, there should be a non-NULL point. | 1477 // Since a timer is running, there should be a non-NULL point. |
| 1475 const GesturePoint* point = GetPointByPointId(0); | 1478 const GesturePoint* point = GetPointByPointId(0); |
| 1476 if (!point->IsInsideTouchSlopRegion(event)) { | 1479 if (!point->IsInsideTouchSlopRegion(event)) { |
| 1477 GetLongPressTimer()->Stop(); | 1480 GetLongPressTimer()->Stop(); |
| 1478 GetShowPressTimer()->Stop(); | 1481 GetShowPressTimer()->Stop(); |
| 1479 } | 1482 } |
| 1480 } | 1483 } |
| 1481 | 1484 |
| 1482 } // namespace ui | 1485 } // namespace ui |
| OLD | NEW |