| Index: content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc
|
| diff --git a/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc b/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc
|
| index 833f0ab5fee55ba61af64985edb73fd6085e3fb6..3d9171683a5f55c2502d6124249835bdaeee0118 100644
|
| --- a/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc
|
| +++ b/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc
|
| @@ -1250,32 +1250,37 @@
|
|
|
| // TouchMove's movedBeyondSlopRegion within the slop region is set to false.
|
| MoveTouchPoint(0, 0, kHalfSlopLengthDips);
|
| - EXPECT_EQ(0U, queued_event_count());
|
| - EXPECT_EQ(0U, GetAndResetSentEventCount());
|
| + EXPECT_EQ(1U, queued_event_count());
|
| + SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| + EXPECT_EQ(1U, GetAndResetSentEventCount());
|
| EXPECT_EQ(1U, GetAndResetAckedEventCount());
|
| EXPECT_FALSE(acked_event().moved_beyond_slop_region);
|
|
|
| MoveTouchPoint(0, kHalfSlopLengthDips, 0);
|
| - EXPECT_EQ(0U, queued_event_count());
|
| - EXPECT_EQ(0U, GetAndResetSentEventCount());
|
| + EXPECT_EQ(1U, queued_event_count());
|
| + SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| + EXPECT_EQ(1U, GetAndResetSentEventCount());
|
| EXPECT_EQ(1U, GetAndResetAckedEventCount());
|
| EXPECT_FALSE(acked_event().moved_beyond_slop_region);
|
|
|
| MoveTouchPoint(0, -kHalfSlopLengthDips, 0);
|
| - EXPECT_EQ(0U, queued_event_count());
|
| - EXPECT_EQ(0U, GetAndResetSentEventCount());
|
| + EXPECT_EQ(1U, queued_event_count());
|
| + SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| + EXPECT_EQ(1U, GetAndResetSentEventCount());
|
| EXPECT_EQ(1U, GetAndResetAckedEventCount());
|
| EXPECT_FALSE(acked_event().moved_beyond_slop_region);
|
|
|
| MoveTouchPoint(0, -kSlopLengthDips, 0);
|
| - EXPECT_EQ(0U, queued_event_count());
|
| - EXPECT_EQ(0U, GetAndResetSentEventCount());
|
| + EXPECT_EQ(1U, queued_event_count());
|
| + SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| + EXPECT_EQ(1U, GetAndResetSentEventCount());
|
| EXPECT_EQ(1U, GetAndResetAckedEventCount());
|
| EXPECT_FALSE(acked_event().moved_beyond_slop_region);
|
|
|
| MoveTouchPoint(0, 0, kSlopLengthDips);
|
| - EXPECT_EQ(0U, queued_event_count());
|
| - EXPECT_EQ(0U, GetAndResetSentEventCount());
|
| + EXPECT_EQ(1U, queued_event_count());
|
| + SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| + EXPECT_EQ(1U, GetAndResetSentEventCount());
|
| EXPECT_EQ(1U, GetAndResetAckedEventCount());
|
| EXPECT_FALSE(acked_event().moved_beyond_slop_region);
|
|
|
| @@ -1290,6 +1295,7 @@
|
| EXPECT_EQ(0U, GetAndResetAckedEventCount());
|
| SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| EXPECT_EQ(1U, GetAndResetAckedEventCount());
|
| + EXPECT_TRUE(acked_event().moved_beyond_slop_region);
|
| }
|
|
|
| // Tests that even very small TouchMove's movedBeyondSlopRegion is set to true
|
|
|