Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/browser/renderer_host/input/input_router_impl_unittest.cc

Issue 252023005: Revert 266470 "Implement async touchmove dispatch during scroll" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/browser/renderer_host/input/input_router_impl.cc ('k') | trunk/src/content/browser/renderer_host/input/touch_event_queue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/renderer_host/input/input_router_impl_unittest.cc
===================================================================
--- trunk/src/content/browser/renderer_host/input/input_router_impl_unittest.cc (revision 266575)
+++ trunk/src/content/browser/renderer_host/input/input_router_impl_unittest.cc (working copy)
@@ -51,29 +51,6 @@
return reinterpret_cast<const WebInputEvent*>(data);
}
-WebInputEvent& GetEventWithType(WebInputEvent::Type type) {
- WebInputEvent* event = NULL;
- if (WebInputEvent::isMouseEventType(type)) {
- static WebMouseEvent mouse;
- event = &mouse;
- } else if (WebInputEvent::isTouchEventType(type)) {
- static WebTouchEvent touch;
- event = &touch;
- } else if (WebInputEvent::isKeyboardEventType(type)) {
- static WebKeyboardEvent key;
- event = &key;
- } else if (WebInputEvent::isGestureEventType(type)) {
- static WebGestureEvent gesture;
- event = &gesture;
- } else if (type == WebInputEvent::MouseWheel) {
- static WebMouseWheelEvent wheel;
- event = &wheel;
- }
- CHECK(event);
- event->type = type;
- return *event;
-}
-
bool GetIsShortcutFromHandleInputEventMessage(const IPC::Message* msg) {
InputMsg_HandleInputEvent::Schema::Param param;
InputMsg_HandleInputEvent::Read(msg, &param);
@@ -275,7 +252,6 @@
void CancelTouchPoint(int index) {
touch_event_.CancelPoint(index);
}
-
void SendInputEventACK(blink::WebInputEvent::Type type,
InputEventAckState ack_result) {
scoped_ptr<IPC::Message> response(
@@ -766,7 +742,7 @@
ASSERT_LT(start_type, end_type);
for (int i = start_type; i <= end_type; ++i) {
WebInputEvent::Type type = static_cast<WebInputEvent::Type>(i);
- if (!WebInputEventTraits::IgnoresAckDisposition(GetEventWithType(type)))
+ if (!WebInputEventTraits::IgnoresAckDisposition(type))
continue;
// The TouchEventQueue requires an initial TouchStart for it to begin
@@ -827,7 +803,7 @@
WebInputEvent::GestureScrollEnd};
for (int i = 0; i < kEventTypesLength; ++i) {
WebInputEvent::Type type = eventTypes[i];
- if (!WebInputEventTraits::IgnoresAckDisposition(GetEventWithType(type))) {
+ if (!WebInputEventTraits::IgnoresAckDisposition(type)) {
SimulateGestureEvent(type, WebGestureEvent::Touchscreen);
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
@@ -847,6 +823,10 @@
EXPECT_EQ(1U, ack_handler_->GetAndResetAckCount());
EXPECT_EQ(0, client_->in_flight_event_count());
EXPECT_FALSE(HasPendingEvents());
+ SendInputEventACK(type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
+ EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+ EXPECT_FALSE(HasPendingEvents());
}
}
@@ -857,8 +837,7 @@
for (int i = start_type; i <= end_type; ++i) {
WebInputEvent::Type type = static_cast<WebInputEvent::Type>(i);
int expected_in_flight_event_count =
- WebInputEventTraits::IgnoresAckDisposition(GetEventWithType(type)) ? 0
- : 1;
+ WebInputEventTraits::IgnoresAckDisposition(type) ? 0 : 1;
// Note: Mouse event acks are never forwarded to the ack handler, so the key
// result here is that ignored ack types don't affect the in-flight count.
@@ -866,12 +845,10 @@
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
EXPECT_EQ(expected_in_flight_event_count, client_->in_flight_event_count());
- if (expected_in_flight_event_count) {
- SendInputEventACK(type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
- EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
- EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
- EXPECT_EQ(0, client_->in_flight_event_count());
- }
+ SendInputEventACK(type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
+ EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+ EXPECT_EQ(0, client_->in_flight_event_count());
}
}
@@ -894,8 +871,7 @@
};
for (size_t i = 0; i < arraysize(kRequiredEventAckTypes); ++i) {
const WebInputEvent::Type required_ack_type = kRequiredEventAckTypes[i];
- EXPECT_FALSE(WebInputEventTraits::IgnoresAckDisposition(
- GetEventWithType(required_ack_type)));
+ EXPECT_FALSE(WebInputEventTraits::IgnoresAckDisposition(required_ack_type));
}
}
@@ -944,27 +920,51 @@
EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
- // Now ack each ack-respecting event. Ack-ignoring events should not be
- // dispatched until all prior events which observe ack disposition have been
- // fired, at which point they should be sent immediately. They should also
- // have no effect on the in-flight event count.
+ // Now ack each event. Ack-ignoring events should not be dispatched until all
+ // prior events which observe ack disposition have been fired, at which
+ // point they should be sent immediately. They should also have no effect
+ // on the in-flight event count.
+ SendInputEventACK(WebInputEvent::GestureScrollBegin,
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(2U, GetSentMessageCountAndResetSink());
EXPECT_EQ(2U, ack_handler_->GetAndResetAckCount());
EXPECT_EQ(1, client_->in_flight_event_count());
+ // For events which ignore ack disposition, non-synthetic acks are ignored.
+ SendInputEventACK(WebInputEvent::GestureTapDown,
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
+ EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+ EXPECT_EQ(1, client_->in_flight_event_count());
+
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(2U, GetSentMessageCountAndResetSink());
EXPECT_EQ(2U, ack_handler_->GetAndResetAckCount());
EXPECT_EQ(1, client_->in_flight_event_count());
+ // For events which ignore ack disposition, non-synthetic acks are ignored.
+ SendInputEventACK(WebInputEvent::GestureShowPress,
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
+ EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+ EXPECT_EQ(1, client_->in_flight_event_count());
+
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
EXPECT_EQ(2U, ack_handler_->GetAndResetAckCount());
EXPECT_EQ(0, client_->in_flight_event_count());
+
+ // For events which ignore ack disposition, non-synthetic acks are ignored.
+ SendInputEventACK(WebInputEvent::GestureTapCancel,
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
+ EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+ EXPECT_EQ(0, client_->in_flight_event_count());
}
// Test that GestureShowPress events don't get out of order due to
@@ -1003,6 +1003,12 @@
// ShowPress has entered the queue.
EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+ // This ack is ignored.
+ SendInputEventACK(WebInputEvent::GesturePinchBegin,
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+ EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
+ EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
+
SendInputEventACK(WebInputEvent::GesturePinchUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
// Now that the Tap has been ACKed, the ShowPress events should receive
@@ -1282,6 +1288,8 @@
// auto.
SimulateGestureEvent(WebInputEvent::GestureTapUnconfirmed,
WebGestureEvent::Touchscreen);
+ SendInputEventACK(WebInputEvent::GestureTap,
+ INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
// This tap gesture is dropped, since the GestureTapUnconfirmed was turned
@@ -1305,7 +1313,7 @@
WebGestureEvent::Touchscreen);
// This test will become invalid if GestureDoubleTap stops requiring an ack.
DCHECK(!WebInputEventTraits::IgnoresAckDisposition(
- GetEventWithType(WebInputEvent::GestureDoubleTap)));
+ WebInputEvent::GestureDoubleTap));
EXPECT_EQ(0, client_->in_flight_event_count());
}
@@ -1341,10 +1349,6 @@
WebGestureEvent::Touchscreen);
SimulateGestureEvent(WebInputEvent::GestureScrollUpdate,
WebGestureEvent::Touchscreen);
- SimulateGestureEvent(WebInputEvent::GesturePinchBegin,
- WebGestureEvent::Touchscreen);
- SimulateGestureEvent(WebInputEvent::GesturePinchUpdate,
- WebGestureEvent::Touchscreen);
Flush();
EXPECT_EQ(0U, GetAndResetDidFlushCount());
@@ -1359,13 +1363,13 @@
EXPECT_TRUE(HasPendingEvents());
// One more gesture to go.
- SendInputEventACK(WebInputEvent::GestureScrollUpdate,
+ SendInputEventACK(WebInputEvent::GestureScrollBegin,
INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(0U, GetAndResetDidFlushCount());
EXPECT_TRUE(HasPendingEvents());
// The final ack'ed gesture should trigger the DidFlush.
- SendInputEventACK(WebInputEvent::GesturePinchUpdate,
+ SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(1U, GetAndResetDidFlushCount());
EXPECT_FALSE(HasPendingEvents());
« no previous file with comments | « trunk/src/content/browser/renderer_host/input/input_router_impl.cc ('k') | trunk/src/content/browser/renderer_host/input/touch_event_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698