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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 2482453002: Don't restart the hang renderer timeout on messages ack'd from the compositor thread. (Closed)
Patch Set: Fix mac build Created 4 years, 1 month 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
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 3cabe3e2db1cda955bb6be3903c1d8550f6843b6..e982a8ee8c03d6bbff57414bd84f2be90a577a5f 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -583,7 +583,7 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
void SendInputEventACK(WebInputEvent::Type type,
InputEventAckState ack_result) {
DCHECK(!WebInputEvent::isTouchEventType(type));
- InputEventAck ack(type, ack_result);
+ InputEventAck ack(InputEventAckSource::COMPOSITOR_THREAD, type, ack_result);
InputHostMsg_HandleInputEvent_ACK response(0, ack);
widget_host_->OnMessageReceived(response);
}
@@ -592,7 +592,8 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
InputEventAckState ack_result,
uint32_t event_id) {
DCHECK(WebInputEvent::isTouchEventType(type));
- InputEventAck ack(type, ack_result, event_id);
+ InputEventAck ack(InputEventAckSource::COMPOSITOR_THREAD, type, ack_result,
+ event_id);
InputHostMsg_HandleInputEvent_ACK response(0, ack);
widget_host_->OnMessageReceived(response);
}
@@ -1342,9 +1343,9 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
// Ack'ing the outstanding event should flush the pending touch queue.
- InputEventAck ack(blink::WebInputEvent::TouchStart,
- INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS,
- press.unique_event_id());
+ InputEventAck ack(
+ InputEventAckSource::COMPOSITOR_THREAD, blink::WebInputEvent::TouchStart,
+ INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, press.unique_event_id());
widget_host_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack));
EXPECT_EQ(0U, GetSentMessageCountAndResetSink());

Powered by Google App Engine
This is Rietveld 408576698