OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
563 EXPECT_FALSE(FlingInProgress()); | 563 EXPECT_FALSE(FlingInProgress()); |
564 EXPECT_EQ(5U, GestureEventLastQueueEventSize()); | 564 EXPECT_EQ(5U, GestureEventLastQueueEventSize()); |
565 } | 565 } |
566 | 566 |
567 INSTANTIATE_TEST_CASE_P(AllSources, | 567 INSTANTIATE_TEST_CASE_P(AllSources, |
568 GestureEventFilterWithSourceTest, | 568 GestureEventFilterWithSourceTest, |
569 testing::Values(WebGestureEvent::Touchscreen, | 569 testing::Values(WebGestureEvent::Touchscreen, |
570 WebGestureEvent::Touchpad)); | 570 WebGestureEvent::Touchpad)); |
571 #endif // GTEST_HAS_PARAM_TEST | 571 #endif // GTEST_HAS_PARAM_TEST |
572 | 572 |
573 // Test that GestureShowPress events don't wait for ACKs. | 573 // Test that GestureShowPress and GestureTapDown events don't wait for ACKs. |
574 TEST_F(GestureEventFilterTest, GestureShowPressIgnoresAck) { | 574 TEST_F(GestureEventFilterTest, GestureShowPressAndTapDownIgnoreAck) { |
575 SimulateGestureEvent(WebInputEvent::GestureShowPress, | 575 SimulateGestureEvent(WebInputEvent::GestureShowPress, |
576 WebGestureEvent::Touchscreen); | 576 WebGestureEvent::Touchscreen); |
577 | 577 |
578 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); | 578 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); |
579 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); | 579 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); |
580 | 580 |
581 SimulateGestureEvent(WebInputEvent::GestureShowPress, | 581 SimulateGestureEvent(WebInputEvent::GestureShowPress, |
582 WebGestureEvent::Touchscreen); | 582 WebGestureEvent::Touchscreen); |
583 | 583 |
584 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); | 584 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); |
585 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); | 585 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); |
586 | 586 |
587 SimulateGestureEvent(WebInputEvent::GestureShowPress, | 587 SimulateGestureEvent(WebInputEvent::GestureShowPress, |
588 WebGestureEvent::Touchscreen); | 588 WebGestureEvent::Touchscreen); |
589 | 589 |
590 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); | 590 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); |
591 // The show press events will have escaped the queue, since they ignore acks. | 591 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); |
| 592 |
| 593 SimulateGestureEvent(WebInputEvent::GestureTapDown, |
| 594 WebGestureEvent::Touchscreen); |
| 595 |
| 596 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); |
| 597 // The show press and tap down events will have escaped the queue, since they |
| 598 // ignore acks. |
592 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); | 599 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); |
593 } | 600 } |
594 | 601 |
595 // Test that GestureShowPress events don't get out of order due to | 602 // Test that GestureShowPress events don't get out of order due to |
596 // ignoring their acks. | 603 // ignoring their acks. |
597 TEST_F(GestureEventFilterTest, GestureShowPressIsInOrder) { | 604 TEST_F(GestureEventFilterTest, GestureShowPressIsInOrder) { |
598 SimulateGestureEvent(WebInputEvent::GestureTap, | 605 SimulateGestureEvent(WebInputEvent::GestureTap, |
599 WebGestureEvent::Touchscreen); | 606 WebGestureEvent::Touchscreen); |
600 | 607 |
601 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); | 608 EXPECT_EQ(1U, GetAndResetSentGestureEventCount()); |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 gesture_event.data.flingStart.velocityX = 0.f; | 742 gesture_event.data.flingStart.velocityX = 0.f; |
736 gesture_event.data.flingStart.velocityY = 0.f; | 743 gesture_event.data.flingStart.velocityY = 0.f; |
737 ASSERT_EQ(0U, GetAndResetSentGestureEventCount()); | 744 ASSERT_EQ(0U, GetAndResetSentGestureEventCount()); |
738 ASSERT_EQ(0U, GestureEventLastQueueEventSize()); | 745 ASSERT_EQ(0U, GestureEventLastQueueEventSize()); |
739 EXPECT_FALSE(SimulateGestureEvent(gesture_event)); | 746 EXPECT_FALSE(SimulateGestureEvent(gesture_event)); |
740 EXPECT_EQ(0U, GetAndResetSentGestureEventCount()); | 747 EXPECT_EQ(0U, GetAndResetSentGestureEventCount()); |
741 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); | 748 EXPECT_EQ(0U, GestureEventLastQueueEventSize()); |
742 } | 749 } |
743 | 750 |
744 } // namespace content | 751 } // namespace content |
OLD | NEW |