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 8a4c7d2e141effe98e9661099406a9b96e980076..e45660e2beff73c0beaf0902acaa77fb96dc9e06 100644 |
--- a/content/browser/renderer_host/input/input_router_impl_unittest.cc |
+++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc |
@@ -1021,11 +1021,11 @@ TEST_F(InputRouterImplTest, UnhandledWheelEventWithGestureScrolling) { |
TEST_F(InputRouterImplTest, TouchTypesIgnoringAck) { |
OnHasTouchEventHandlers(true); |
// Only acks for TouchCancel should always be ignored. |
- ASSERT_TRUE(WebInputEventTraits::WillReceiveAckFromRenderer( |
+ ASSERT_TRUE(WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(WebInputEvent::TouchStart))); |
- ASSERT_TRUE(WebInputEventTraits::WillReceiveAckFromRenderer( |
+ ASSERT_TRUE(WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(WebInputEvent::TouchMove))); |
- ASSERT_TRUE(WebInputEventTraits::WillReceiveAckFromRenderer( |
+ ASSERT_TRUE(WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(WebInputEvent::TouchEnd))); |
// Precede the TouchCancel with an appropriate TouchStart; |
@@ -1084,7 +1084,7 @@ TEST_F(InputRouterImplTest, GestureTypesIgnoringAck) { |
WebInputEvent::GestureScrollEnd}; |
for (size_t i = 0; i < arraysize(eventTypes); ++i) { |
WebInputEvent::Type type = eventTypes[i]; |
- if (WebInputEventTraits::WillReceiveAckFromRenderer( |
+ if (WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(type))) { |
SimulateGestureEvent(type, blink::WebGestureDeviceTouchscreen); |
EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); |
@@ -1115,7 +1115,7 @@ TEST_F(InputRouterImplTest, MouseTypesIgnoringAck) { |
for (int i = start_type; i <= end_type; ++i) { |
WebInputEvent::Type type = static_cast<WebInputEvent::Type>(i); |
int expected_in_flight_event_count = |
- !WebInputEventTraits::WillReceiveAckFromRenderer(GetEventWithType(type)) |
+ !WebInputEventTraits::ShouldBlockEventOnRenderer(GetEventWithType(type)) |
? 0 |
: 1; |
@@ -1135,7 +1135,7 @@ TEST_F(InputRouterImplTest, MouseTypesIgnoringAck) { |
} |
// Guard against breaking changes to the list of ignored event ack types in |
-// |WebInputEventTraits::WillReceiveAckFromRenderer|. |
+// |WebInputEventTraits::ShouldBlockEventOnRenderer|. |
TEST_F(InputRouterImplTest, RequiredEventAckTypes) { |
const WebInputEvent::Type kRequiredEventAckTypes[] = { |
WebInputEvent::MouseMove, |
@@ -1153,7 +1153,7 @@ TEST_F(InputRouterImplTest, RequiredEventAckTypes) { |
}; |
for (size_t i = 0; i < arraysize(kRequiredEventAckTypes); ++i) { |
const WebInputEvent::Type required_ack_type = kRequiredEventAckTypes[i]; |
- ASSERT_TRUE(WebInputEventTraits::WillReceiveAckFromRenderer( |
+ ASSERT_TRUE(WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(required_ack_type))); |
} |
} |
@@ -1584,7 +1584,7 @@ TEST_F(InputRouterImplTest, DoubleTapGestureDependsOnFirstTap) { |
blink::WebGestureDeviceTouchscreen); |
EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); |
// This test will become invalid if GestureTap stops requiring an ack. |
- ASSERT_TRUE(WebInputEventTraits::WillReceiveAckFromRenderer( |
+ ASSERT_TRUE(WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(WebInputEvent::GestureTap))); |
EXPECT_EQ(2, client_->in_flight_event_count()); |
SendInputEventACK(WebInputEvent::GestureTap, |
@@ -1614,7 +1614,7 @@ TEST_F(InputRouterImplTest, DoubleTapGestureDependsOnFirstTap) { |
SimulateGestureEvent(WebInputEvent::GestureDoubleTap, |
blink::WebGestureDeviceTouchscreen); |
// This test will become invalid if GestureDoubleTap stops requiring an ack. |
- ASSERT_TRUE(WebInputEventTraits::WillReceiveAckFromRenderer( |
+ ASSERT_TRUE(WebInputEventTraits::ShouldBlockEventOnRenderer( |
GetEventWithType(WebInputEvent::GestureDoubleTap))); |
EXPECT_EQ(1, client_->in_flight_event_count()); |
SendInputEventACK(WebInputEvent::GestureTap, INPUT_EVENT_ACK_STATE_CONSUMED); |