Index: content/browser/renderer_host/render_widget_host_unittest.cc |
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc |
index 46acbd1dbae6d48581ac9393358222dd4d686b81..f55ad5029db0b51df4a01961bbff42420708b071 100644 |
--- a/content/browser/renderer_host/render_widget_host_unittest.cc |
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc |
@@ -459,9 +459,21 @@ class RenderWidgetHostTest : public testing::Test { |
void SendInputEventACK(WebInputEvent::Type type, |
InputEventAckState ack_result) { |
- InputHostMsg_HandleInputEvent_ACK_Params ack; |
- ack.type = type; |
- ack.state = ack_result; |
+ InputEventAck ack(type, ack_result); |
jdduke (slow)
2015/05/07 21:11:15
Maybe DCHECK(!WebInputEventTraits::isTouchEventTyp
lanwei
2015/05/08 19:31:26
Done.
|
+ host_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); |
+ } |
+ |
+ void SendTouchEventACK(WebInputEvent::Type type, |
jdduke (slow)
2015/05/07 21:11:15
This is used just once, I'd rather we either just
lanwei
2015/05/08 19:31:25
Done.
|
+ InputEventAckState ack_result) { |
+ InputEventAck ack(type, ack_result); |
+ size_t count = process_->sink().message_count(); |
+ LOG(ERROR) << " count " << count; |
jdduke (slow)
2015/05/07 21:11:15
Not sure we need this log?
lanwei
2015/05/08 19:31:26
Forgot to delete :)
|
+ for (size_t i = 0; i < count; ++i) { |
+ const WebInputEvent* input_event = |
+ GetInputEventFromMessage(*process_->sink().GetMessageAt(i)); |
+ ack.unique_touch_event_id = |
+ WebInputEventTraits::GetUniqueTouchEventId(*input_event); |
+ } |
host_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); |
} |
@@ -1436,9 +1448,9 @@ TEST_F(RenderWidgetHostTest, InputEventRWHLatencyComponent) { |
// Tests RWHI::ForwardTouchEventWithLatencyInfo(). |
PressTouchPoint(0, 1); |
SendTouchEvent(); |
+ SendTouchEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED); |
CheckLatencyInfoComponentInMessage( |
process_, GetLatencyComponentId(), WebInputEvent::TouchStart); |
- SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED); |
} |
TEST_F(RenderWidgetHostTest, RendererExitedResetsInputRouter) { |