| Index: ui/aura/gestures/gesture_recognizer_unittest.cc
|
| diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| index e377a3fb01e608f3f65e4fc01c218d7ee2fceb7d..3c3e14f38d735321fca19391910e62cbe38bace9 100644
|
| --- a/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| @@ -511,7 +511,7 @@ class TimedEvents {
|
| base::TimeDelta::FromMilliseconds(time_in_millis);
|
| }
|
|
|
| - void SendScrollEvents(ui::EventProcessor* dispatcher,
|
| + void SendScrollEvents(ui::EventSink* sink,
|
| int x_start,
|
| int y_start,
|
| int dx,
|
| @@ -530,13 +530,13 @@ class TimedEvents {
|
| ui::ET_TOUCH_MOVED, gfx::Point(x, y), tick_clock_.NowTicks(),
|
| ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
|
| touch_id));
|
| - ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = sink->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| tick_clock_.Advance(base::TimeDelta::FromMilliseconds(time_step_ms));
|
| }
|
| }
|
|
|
| - void SendScrollEvent(ui::EventProcessor* dispatcher,
|
| + void SendScrollEvent(ui::EventSink* sink,
|
| float x,
|
| float y,
|
| int touch_id,
|
| @@ -547,7 +547,7 @@ class TimedEvents {
|
| ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, touch_id));
|
| move.set_location_f(gfx::PointF(x, y));
|
| move.set_root_location_f(gfx::PointF(x, y));
|
| - ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = sink->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| }
|
| };
|
| @@ -1052,8 +1052,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
|
| // should generate both SCROLL_BEGIN and SCROLL_UPDATE gestures.
|
| // The first movement is diagonal, to ensure that we have a free scroll,
|
| // and not a rail scroll.
|
| - tes.SendScrollEvent(event_processor(), 111.5, 211.5, kTouchId,
|
| - delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 111.5, 211.5, kTouchId, delegate.get());
|
| EXPECT_3_EVENTS(delegate->events(),
|
| ui::ET_GESTURE_TAP_CANCEL,
|
| ui::ET_GESTURE_SCROLL_BEGIN,
|
| @@ -1070,13 +1069,13 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
|
|
|
| // Move some more to generate a few more scroll updates. Make sure that we get
|
| // out of the snap channel for the unified GR.
|
| - tes.SendScrollEvent(event_processor(), 20, 120, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 20, 120, kTouchId, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);
|
| EXPECT_FLOAT_EQ(-91.5, delegate->scroll_x());
|
| EXPECT_FLOAT_EQ(-91.5, delegate->scroll_y());
|
| EXPECT_TRUE(delegate->bounding_box().IsEmpty());
|
|
|
| - tes.SendScrollEvent(event_processor(), 50, 124, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 50, 124, kTouchId, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);
|
| EXPECT_EQ(30, delegate->scroll_x());
|
| EXPECT_EQ(4, delegate->scroll_y());
|
| @@ -1142,7 +1141,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollPrediction) {
|
| // The first movement is diagonal, to ensure that we have a free scroll,
|
| // and not a rail scroll.
|
| tes.LeapForward(30);
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(),
|
| ui::ET_GESTURE_SCROLL_UPDATE);
|
| total_scroll.set_x(total_scroll.x() + delegate->scroll_x());
|
| @@ -1150,13 +1149,13 @@ TEST_F(GestureRecognizerTest, GestureEventScrollPrediction) {
|
|
|
| // Move some more to generate a few more scroll updates.
|
| tes.LeapForward(30);
|
| - tes.SendScrollEvent(event_processor(), 110, 211, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 110, 211, kTouchId, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);
|
| total_scroll.set_x(total_scroll.x() + delegate->scroll_x());
|
| total_scroll.set_y(total_scroll.y() + delegate->scroll_y());
|
|
|
| tes.LeapForward(30);
|
| - tes.SendScrollEvent(event_processor(), 140, 215, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 140, 215, kTouchId, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);
|
| total_scroll.set_x(total_scroll.x() + delegate->scroll_x());
|
| total_scroll.set_y(total_scroll.y() + delegate->scroll_y());
|
| @@ -1195,8 +1194,8 @@ TEST_F(GestureRecognizerTest, GestureEventScrollBoundingBox) {
|
| delegate->bounding_box());
|
|
|
| const int kScrollAmount = 50;
|
| - tes.SendScrollEvents(event_processor(), kPositionX, kPositionY,
|
| - 1, 1, kTouchId, 1, kScrollAmount, delegate.get());
|
| + tes.SendScrollEvents(event_sink(), kPositionX, kPositionY, 1, 1, kTouchId,
|
| + 1, kScrollAmount, delegate.get());
|
| EXPECT_EQ(gfx::Point(1, 1).ToString(),
|
| delegate->scroll_begin_position().ToString());
|
| EXPECT_EQ(
|
| @@ -1246,20 +1245,13 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailFling) {
|
|
|
| // Move the touch-point horizontally enough that it is considered a
|
| // horizontal scroll.
|
| - tes.SendScrollEvent(event_processor(), 30, 1, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 30, 1, kTouchId, delegate.get());
|
| EXPECT_FLOAT_EQ(0, delegate->scroll_y());
|
| EXPECT_FLOAT_EQ(20, delegate->scroll_x());
|
|
|
| // Get a high x velocity, while still staying on the rail
|
| const int kScrollAmount = 8;
|
| - tes.SendScrollEvents(event_processor(),
|
| - 1,
|
| - 1,
|
| - 100,
|
| - 10,
|
| - kTouchId,
|
| - 1,
|
| - kScrollAmount,
|
| + tes.SendScrollEvents(event_sink(), 1, 1, 100, 10, kTouchId, 1, kScrollAmount,
|
| delegate.get());
|
|
|
| delegate->Reset();
|
| @@ -1299,21 +1291,14 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailFling) {
|
|
|
| // Move the touch-point vertically enough that it is considered a
|
| // vertical scroll.
|
| - tes.SendScrollEvent(event_processor(), 1, 30, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 1, 30, kTouchId, delegate.get());
|
| EXPECT_EQ(20, delegate->scroll_y());
|
| EXPECT_EQ(0, delegate->scroll_x());
|
| EXPECT_EQ(0, delegate->scroll_velocity_x());
|
|
|
| // Get a high y velocity, while still staying on the rail
|
| const int kScrollAmount = 8;
|
| - tes.SendScrollEvents(event_processor(),
|
| - 1,
|
| - 6,
|
| - 10,
|
| - 100,
|
| - kTouchId,
|
| - 1,
|
| - kScrollAmount,
|
| + tes.SendScrollEvents(event_sink(), 1, 6, 10, 100, kTouchId, 1, kScrollAmount,
|
| delegate.get());
|
| EXPECT_EQ(0, delegate->scroll_velocity_x());
|
|
|
| @@ -1349,19 +1334,12 @@ TEST_F(GestureRecognizerTest, GestureEventNonRailFling) {
|
|
|
| // Move the touch-point such that a non-rail scroll begins, and we're outside
|
| // the snap channel for the unified GR.
|
| - tes.SendScrollEvent(event_processor(), 50, 50, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 50, 50, kTouchId, delegate.get());
|
| EXPECT_EQ(50, delegate->scroll_y());
|
| EXPECT_EQ(50, delegate->scroll_x());
|
|
|
| const int kScrollAmount = 8;
|
| - tes.SendScrollEvents(event_processor(),
|
| - 1,
|
| - 1,
|
| - 10,
|
| - 100,
|
| - kTouchId,
|
| - 1,
|
| - kScrollAmount,
|
| + tes.SendScrollEvents(event_sink(), 1, 1, 10, 100, kTouchId, 1, kScrollAmount,
|
| delegate.get());
|
|
|
| delegate->Reset();
|
| @@ -1442,7 +1420,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledByScroll) {
|
| EXPECT_FALSE(delegate->tap_cancel());
|
|
|
| // Scroll around, to cancel the long press
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
|
|
| // Wait until a long press event would have fired, if it hadn't been
|
| // cancelled.
|
| @@ -1580,11 +1558,11 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailScroll) {
|
|
|
| // Move the touch-point horizontally enough that it is considered a
|
| // horizontal scroll.
|
| - tes.SendScrollEvent(event_processor(), 25, 0, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 25, 0, kTouchId, delegate.get());
|
| EXPECT_EQ(0, delegate->scroll_y());
|
| EXPECT_EQ(20, delegate->scroll_x());
|
|
|
| - tes.SendScrollEvent(event_processor(), 30, 6, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 30, 6, kTouchId, delegate.get());
|
| EXPECT_TRUE(delegate->scroll_update());
|
| EXPECT_EQ(5, delegate->scroll_x());
|
| // y shouldn't change, as we're on a horizontal rail.
|
| @@ -1593,18 +1571,11 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailScroll) {
|
| // Send enough information that a velocity can be calculated for the gesture,
|
| // and we can break the rail
|
| const int kScrollAmount = 8;
|
| - tes.SendScrollEvents(event_processor(),
|
| - 1,
|
| - 1,
|
| - 6,
|
| - 100,
|
| - kTouchId,
|
| - 1,
|
| - kScrollAmount,
|
| + tes.SendScrollEvents(event_sink(), 1, 1, 6, 100, kTouchId, 1, kScrollAmount,
|
| delegate.get());
|
|
|
| - tes.SendScrollEvent(event_processor(), 5, 0, kTouchId, delegate.get());
|
| - tes.SendScrollEvent(event_processor(), 10, 5, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 5, 0, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 10, 5, kTouchId, delegate.get());
|
|
|
| // The rail should be broken
|
| EXPECT_TRUE(delegate->scroll_update());
|
| @@ -1637,11 +1608,11 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailScroll) {
|
|
|
| // Move the touch-point vertically enough that it is considered a
|
| // vertical scroll.
|
| - tes.SendScrollEvent(event_processor(), 0, 25, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 0, 25, kTouchId, delegate.get());
|
| EXPECT_EQ(0, delegate->scroll_x());
|
| EXPECT_EQ(20, delegate->scroll_y());
|
|
|
| - tes.SendScrollEvent(event_processor(), 6, 30, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 6, 30, kTouchId, delegate.get());
|
| EXPECT_TRUE(delegate->scroll_update());
|
| EXPECT_EQ(5, delegate->scroll_y());
|
| // x shouldn't change, as we're on a vertical rail.
|
| @@ -1651,18 +1622,11 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailScroll) {
|
| // Send enough information that a velocity can be calculated for the gesture,
|
| // and we can break the rail
|
| const int kScrollAmount = 8;
|
| - tes.SendScrollEvents(event_processor(),
|
| - 1,
|
| - 6,
|
| - 100,
|
| - 1,
|
| - kTouchId,
|
| - 1,
|
| - kScrollAmount,
|
| + tes.SendScrollEvents(event_sink(), 1, 6, 100, 1, kTouchId, 1, kScrollAmount,
|
| delegate.get());
|
|
|
| - tes.SendScrollEvent(event_processor(), 0, 5, kTouchId, delegate.get());
|
| - tes.SendScrollEvent(event_processor(), 5, 10, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 0, 5, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 5, 10, kTouchId, delegate.get());
|
|
|
| // The rail should be broken
|
| EXPECT_TRUE(delegate->scroll_update());
|
| @@ -2123,12 +2087,12 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScrollFromPinch) {
|
| EXPECT_FALSE(delegate->pinch_begin());
|
|
|
| // Touch move triggers pinch begin.
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId1, delegate.get());
|
| EXPECT_TRUE(delegate->pinch_begin());
|
| EXPECT_FALSE(delegate->pinch_update());
|
|
|
| // Touch move triggers pinch update.
|
| - tes.SendScrollEvent(event_processor(), 160, 200, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 160, 200, kTouchId1, delegate.get());
|
| EXPECT_FALSE(delegate->pinch_begin());
|
| EXPECT_TRUE(delegate->pinch_update());
|
|
|
| @@ -2140,7 +2104,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScrollFromPinch) {
|
| DispatchEventUsingWindowDispatcher(&release);
|
| EXPECT_TRUE(delegate->pinch_end());
|
|
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId2, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId2, delegate.get());
|
| EXPECT_TRUE(delegate->scroll_update());
|
|
|
| // Pinch again
|
| @@ -2157,7 +2121,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScrollFromPinch) {
|
| DispatchEventUsingWindowDispatcher(&move2);
|
| EXPECT_TRUE(delegate->pinch_begin());
|
|
|
| - tes.SendScrollEvent(event_processor(), 350, 350, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 350, 350, kTouchId1, delegate.get());
|
| EXPECT_TRUE(delegate->pinch_update());
|
| }
|
|
|
| @@ -2829,7 +2793,7 @@ TEST_F(GestureRecognizerTest, TwoFingerTapChangesToPinch) {
|
| kTouchId2));
|
| DispatchEventUsingWindowDispatcher(&press2);
|
|
|
| - tes.SendScrollEvent(event_processor(), 230, 330, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 230, 330, kTouchId1, delegate.get());
|
| EXPECT_FALSE(delegate->two_finger_tap());
|
| EXPECT_TRUE(delegate->pinch_begin());
|
|
|
| @@ -2866,7 +2830,7 @@ TEST_F(GestureRecognizerTest, TwoFingerTapChangesToPinch) {
|
| kTouchId2));
|
| DispatchEventUsingWindowDispatcher(&press2);
|
|
|
| - tes.SendScrollEvent(event_processor(), 301, 230, kTouchId2, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 301, 230, kTouchId2, delegate.get());
|
| EXPECT_FALSE(delegate->two_finger_tap());
|
| EXPECT_TRUE(delegate->pinch_begin());
|
|
|
| @@ -2902,7 +2866,7 @@ TEST_F(GestureRecognizerTest, NoTwoFingerTapWhenFirstFingerHasScrolled) {
|
| ui::ET_TOUCH_PRESSED, gfx::Point(101, 201), tes.Now(),
|
| ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, kTouchId1));
|
| DispatchEventUsingWindowDispatcher(&press1);
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId1, delegate.get());
|
|
|
| delegate->Reset();
|
| ui::TouchEvent press2(
|
| @@ -3177,7 +3141,7 @@ TEST_F(GestureRecognizerTest, LongPressTimerStopsOnPreventDefaultedTouchMoves) {
|
| ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, kTouchId));
|
| DispatchEventUsingWindowDispatcher(&press);
|
| // Scroll around, to cancel the long press
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
|
|
| delegate->Reset();
|
| delegate->ReceivedAck();
|
| @@ -3242,7 +3206,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTouchMoveConsumed) {
|
| // Move the touch-point enough so that it would normally be considered a
|
| // scroll. But since the touch-moves will be consumed, the scroll should not
|
| // start.
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
| EXPECT_FALSE(delegate->tap());
|
| EXPECT_FALSE(delegate->tap_down());
|
| EXPECT_TRUE(delegate->tap_cancel());
|
| @@ -3290,7 +3254,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTwoFingerTouchMoveConsumed) {
|
| ui::ET_TOUCH_PRESSED, gfx::Point(101, 201), tes.Now(),
|
| ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, kTouchId1));
|
| DispatchEventUsingWindowDispatcher(&press1);
|
| - tes.SendScrollEvent(event_processor(), 131, 231, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 131, 231, kTouchId1, delegate.get());
|
|
|
| EXPECT_2_EVENTS(delegate->events(),
|
| ui::ET_GESTURE_TAP_CANCEL,
|
| @@ -3302,12 +3266,12 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTwoFingerTouchMoveConsumed) {
|
| ui::ET_TOUCH_PRESSED, gfx::Point(130, 201), tes.LeapForward(50),
|
| ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, kTouchId2));
|
| DispatchEventUsingWindowDispatcher(&press2);
|
| - tes.SendScrollEvent(event_processor(), 161, 231, kTouchId2, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 161, 231, kTouchId2, delegate.get());
|
| EXPECT_0_EVENTS(delegate->events());
|
|
|
| delegate->Reset();
|
| // Move first finger again, no PinchUpdate & ScrollUpdate.
|
| - tes.SendScrollEvent(event_processor(), 161, 261, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 161, 261, kTouchId1, delegate.get());
|
| EXPECT_0_EVENTS(delegate->events());
|
|
|
| // Stops consuming touch-move.
|
| @@ -3315,11 +3279,11 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTwoFingerTouchMoveConsumed) {
|
|
|
| delegate->Reset();
|
| // Making a pinch gesture.
|
| - tes.SendScrollEvent(event_processor(), 161, 260, kTouchId1, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 161, 260, kTouchId1, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);
|
|
|
| delegate->Reset();
|
| - tes.SendScrollEvent(event_processor(), 161, 261, kTouchId2, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 161, 261, kTouchId2, delegate.get());
|
| EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);
|
|
|
| delegate->Reset();
|
| @@ -3368,7 +3332,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTouchMovePartialConsumed) {
|
| // Move the touch-point enough so that it would normally be considered a
|
| // scroll. But since the touch-moves will be consumed, the scroll should not
|
| // start.
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
| EXPECT_FALSE(delegate->tap());
|
| EXPECT_FALSE(delegate->tap_down());
|
| EXPECT_TRUE(delegate->tap_cancel());
|
| @@ -3381,7 +3345,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTouchMovePartialConsumed) {
|
|
|
| // Now, stop consuming touch-move events, and move the touch-point again.
|
| delegate->set_consume_touch_move(false);
|
| - tes.SendScrollEvent(event_processor(), 159, 259, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 159, 259, kTouchId, delegate.get());
|
| EXPECT_FALSE(delegate->tap());
|
| EXPECT_FALSE(delegate->tap_down());
|
| EXPECT_FALSE(delegate->tap_cancel());
|
| @@ -3400,7 +3364,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTouchMovePartialConsumed) {
|
| delegate->set_consume_touch_move(true);
|
|
|
| // Move some more to generate a few more scroll updates.
|
| - tes.SendScrollEvent(event_processor(), 110, 211, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 110, 211, kTouchId, delegate.get());
|
| EXPECT_FALSE(delegate->tap());
|
| EXPECT_FALSE(delegate->tap_down());
|
| EXPECT_FALSE(delegate->tap_cancel());
|
| @@ -3411,7 +3375,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollTouchMovePartialConsumed) {
|
| EXPECT_EQ(0, delegate->scroll_x());
|
| EXPECT_EQ(0, delegate->scroll_y());
|
|
|
| - tes.SendScrollEvent(event_processor(), 140, 215, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 140, 215, kTouchId, delegate.get());
|
| EXPECT_FALSE(delegate->tap());
|
| EXPECT_FALSE(delegate->tap_down());
|
| EXPECT_FALSE(delegate->tap_cancel());
|
| @@ -3793,7 +3757,7 @@ TEST_F(GestureRecognizerTest, GestureEventConsumedTouchMoveCanFireTapCancel) {
|
| // occur.
|
| // With the unified gesture detector, we will receive a scroll begin gesture,
|
| // whereas with the aura gesture recognizer we won't.
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
| EXPECT_FALSE(delegate->tap());
|
| EXPECT_FALSE(delegate->tap_down());
|
| EXPECT_TRUE(delegate->tap_cancel());
|
| @@ -3930,7 +3894,7 @@ TEST_F(GestureRecognizerTest, GestureEventShowPressCancelledByScroll) {
|
| EXPECT_FALSE(delegate->tap_cancel());
|
|
|
| // Scroll around, to cancel the show press
|
| - tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
|
| + tes.SendScrollEvent(event_sink(), 130, 230, kTouchId, delegate.get());
|
| // Wait until the timer runs out
|
| DelayByShowPressTimeout();
|
| EXPECT_FALSE(delegate->show_press());
|
|
|