| 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 4b0b2bc7205a5d659b41e26a018121df3a59a58d..eac972dff3697bb0aaf3ea260b1d28691326778d 100644
|
| --- a/content/browser/renderer_host/input/input_router_impl_unittest.cc
|
| +++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc
|
| @@ -286,7 +286,9 @@ class InputRouterImplTest : public testing::Test {
|
| void SendInputEventACK(blink::WebInputEvent::Type type,
|
| InputEventAckState ack_result) {
|
| DCHECK(!WebInputEvent::isTouchEventType(type));
|
| - InputEventAck ack(type, ack_result);
|
| + InputEventAck ack(
|
| + InputEventAckLocation::INPUT_EVENT_ACK_LOCATION_COMPOSITOR_THREAD, type,
|
| + ack_result);
|
| input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack));
|
| }
|
|
|
| @@ -294,7 +296,9 @@ class InputRouterImplTest : public testing::Test {
|
| InputEventAckState ack_result,
|
| uint32_t touch_event_id) {
|
| DCHECK(WebInputEvent::isTouchEventType(type));
|
| - InputEventAck ack(type, ack_result, touch_event_id);
|
| + InputEventAck ack(
|
| + InputEventAckLocation::INPUT_EVENT_ACK_LOCATION_COMPOSITOR_THREAD, type,
|
| + ack_result, touch_event_id);
|
| input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack));
|
| }
|
|
|
| @@ -1815,8 +1819,9 @@ TEST_F(InputRouterImplTest, OverscrollDispatch) {
|
| wheel_overscroll.current_fling_velocity = gfx::Vector2dF(1, 0);
|
|
|
| SimulateWheelEvent(0, 0, 3, 0, 0, false);
|
| - InputEventAck ack(WebInputEvent::MouseWheel,
|
| - INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| + InputEventAck ack(
|
| + InputEventAckLocation::INPUT_EVENT_ACK_LOCATION_COMPOSITOR_THREAD,
|
| + WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
|
| ack.overscroll.reset(new DidOverscrollParams(wheel_overscroll));
|
| input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack));
|
|
|
|
|