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

Unified Diff: content/renderer/render_widget_unittest.cc

Issue 283623002: Add support for passing an arbitrary parameter to an IPC message handler. The motivation is for Web… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 6 years, 7 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/renderer/render_view_browsertest.cc ('k') | ipc/ipc_message.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget_unittest.cc
===================================================================
--- content/renderer/render_widget_unittest.cc (revision 270218)
+++ content/renderer/render_widget_unittest.cc (working copy)
@@ -77,10 +77,6 @@
TEST_F(RenderWidgetUnittest, TouchHitTestSinglePoint) {
scoped_refptr<TouchableRenderWidget> widget = new TouchableRenderWidget();
- blink::WebInputEvent::Type type;
- InputEventAckState ack_state;
- ui::LatencyInfo latency;
-
SyntheticWebTouchEvent touch;
touch.PressPoint(10, 10);
@@ -91,7 +87,9 @@
// be 'no consumer exists'.
const IPC::Message* message = widget->sink()->GetMessageAt(0);
EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
- InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+ InputHostMsg_HandleInputEvent_ACK::Param params;
+ InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+ InputEventAckState ack_state = params.b;
EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, ack_state);
widget->sink()->ClearMessages();
@@ -104,7 +102,8 @@
ASSERT_EQ(1u, widget->sink()->message_count());
message = widget->sink()->GetMessageAt(0);
EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
- InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+ InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+ ack_state = params.b;
EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ack_state);
widget->sink()->ClearMessages();
}
@@ -116,10 +115,6 @@
rects.push_back(gfx::Rect(25, 0, 10, 10));
widget->SetTouchRegion(rects);
- blink::WebInputEvent::Type type;
- InputEventAckState ack_state;
- ui::LatencyInfo latency;
-
SyntheticWebTouchEvent touch;
touch.PressPoint(25, 25);
@@ -130,7 +125,9 @@
// be 'no consumer exists'.
const IPC::Message* message = widget->sink()->GetMessageAt(0);
EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
- InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+ InputHostMsg_HandleInputEvent_ACK::Param params;
+ InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+ InputEventAckState ack_state = params.b;
EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, ack_state);
widget->sink()->ClearMessages();
@@ -140,7 +137,8 @@
ASSERT_EQ(1u, widget->sink()->message_count());
message = widget->sink()->GetMessageAt(0);
EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
- InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+ InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+ ack_state = params.b;
EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ack_state);
widget->sink()->ClearMessages();
}
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | ipc/ipc_message.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698