| Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm
|
| diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm
|
| index 9765041979045024875cbeecd5f90cb43791cef1..a3b48b7ed8583eb9792204ded75274201798c2fc 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm
|
| +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm
|
| @@ -275,3 +275,27 @@ TEST_F(MacHistorySwiperTest, NoSwipe) {
|
| EXPECT_EQ(begin_count_, 0);
|
| EXPECT_EQ(end_count_, 0);
|
| }
|
| +
|
| +// After a gesture is successfully recognized, momentum events should be
|
| +// swallowed, but new events should pass through.
|
| +TEST_F(MacHistorySwiperTest, TouchEventAfterGestureFinishes) {
|
| + // These tests require 10.7+ APIs.
|
| + if (![NSEvent
|
| + respondsToSelector:@selector(isSwipeTrackingFromScrollEventsEnabled)])
|
| + return;
|
| +
|
| + // Successfully pass through a gesture.
|
| + startGestureInMiddle();
|
| + moveGestureInMiddle();
|
| + moveGestureAtPoint(makePoint(0.8, 0.5));
|
| + endGestureAtPoint(makePoint(0.8, 0.5));
|
| + EXPECT_TRUE(navigated_right_);
|
| +
|
| + // Momentum events should be swallowed.
|
| + NSEvent* momentumEvent = scrollWheelEventWithPhase(NSEventPhaseNone);
|
| + EXPECT_TRUE([historySwiper_ handleEvent:momentumEvent]);
|
| +
|
| + // New events should not be swallowed.
|
| + NSEvent* beganEvent = scrollWheelEventWithPhase(NSEventPhaseBegan);
|
| + EXPECT_FALSE([historySwiper_ handleEvent:beganEvent]);
|
| +}
|
|
|