Index: content/browser/renderer_host/input/immediate_input_router_unittest.cc |
diff --git a/content/browser/renderer_host/input/immediate_input_router_unittest.cc b/content/browser/renderer_host/input/immediate_input_router_unittest.cc |
index 63ef7d2820766ba1df4ea9acee7c8bc3573a39eb..049a0bc0d7e7b060ae6c49837019bbcd32e980fc 100644 |
--- a/content/browser/renderer_host/input/immediate_input_router_unittest.cc |
+++ b/content/browser/renderer_host/input/immediate_input_router_unittest.cc |
@@ -558,4 +558,45 @@ TEST_F(ImmediateInputRouterTest, UnhandledWheelEvent) { |
EXPECT_EQ(ack_handler_->acked_wheel_event().deltaY, -5); |
} |
+// Test that events ignoring ack disposition don't wait for ACKs. |
+TEST_F(ImmediateInputRouterTest, EventsIgnoringAckDispositionDontWaitForAcks) { |
+ SimulateGestureEvent(WebInputEvent::GestureShowPress, |
+ WebGestureEvent::Touchscreen); |
+ |
+ EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); |
jdduke (slow)
2013/10/25 20:37:12
Please also check that 1) We get the ack immediate
tdresser
2013/11/04 15:57:30
Done.
|
+ |
+ SimulateGestureEvent(WebInputEvent::GestureShowPress, |
+ WebGestureEvent::Touchscreen); |
+ |
+ EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); |
+ |
+ SimulateGestureEvent(WebInputEvent::GestureShowPress, |
+ WebGestureEvent::Touchscreen); |
+ |
+ EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); |
+} |
+ |
+// Test that events don't get out of order due to ignoring their acks. |
+TEST_F(ImmediateInputRouterTest, EventsIgnoringAckDispositionStayInOrder) { |
+ SimulateGestureEvent(WebInputEvent::GestureFlingStart, |
+ WebGestureEvent::Touchscreen); |
+ |
+ EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); |
+ |
+ SimulateGestureEvent(WebInputEvent::GestureShowPress, |
+ WebGestureEvent::Touchscreen); |
+ |
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink()); |
+ |
+ SimulateGestureEvent(WebInputEvent::GestureShowPress, |
+ WebGestureEvent::Touchscreen); |
+ |
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink()); |
+ |
+ SendInputEventACK(WebInputEvent::GestureFlingStart, |
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
+ |
+ EXPECT_EQ(2U, GetSentMessageCountAndResetSink()); |
jdduke (slow)
2013/10/25 20:37:12
Same as above, check that we get the immediate ack
tdresser
2013/11/04 15:57:30
Done.
|
+} |
+ |
} // namespace content |