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

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

Issue 224273002: Revert of [Android] Provide unhandled tap event notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 | « content/browser/android/content_view_core_impl.cc ('k') | content/common/input/web_input_event_traits.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/input_router_impl_unittest.cc
diff --git a/content/browser/renderer_host/input/input_router_impl_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc
index 8093fd95d190567e6819d07767c32b84bf3d1584..9f6760b3139e23b3d29522135b0a9f8c294bfff2 100644
--- a/content/browser/renderer_host/input/input_router_impl_unittest.cc
+++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc
@@ -1267,17 +1267,12 @@
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
// The GestureTapUnconfirmed is converted into a tap, as the touch action is
- // none.
+ // auto.
SimulateGestureEvent(WebInputEvent::GestureTapUnconfirmed,
WebGestureEvent::Touchscreen);
- EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
- // This test will become invalid if GestureTap stops requiring an ack.
- ASSERT_TRUE(!WebInputEventTraits::IgnoresAckDisposition(
- WebInputEvent::GestureTap));
- EXPECT_EQ(2, client_->in_flight_event_count());
SendInputEventACK(WebInputEvent::GestureTap,
INPUT_EVENT_ACK_STATE_CONSUMED);
- EXPECT_EQ(1, client_->in_flight_event_count());
+ EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
// This tap gesture is dropped, since the GestureTapUnconfirmed was turned
// into a tap.
@@ -1299,10 +1294,8 @@
SimulateGestureEvent(WebInputEvent::GestureDoubleTap,
WebGestureEvent::Touchscreen);
// This test will become invalid if GestureDoubleTap stops requiring an ack.
- ASSERT_TRUE(!WebInputEventTraits::IgnoresAckDisposition(
+ DCHECK(!WebInputEventTraits::IgnoresAckDisposition(
WebInputEvent::GestureDoubleTap));
- EXPECT_EQ(1, client_->in_flight_event_count());
- SendInputEventACK(WebInputEvent::GestureTap, INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(0, client_->in_flight_event_count());
}
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/common/input/web_input_event_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698