OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <new> | 5 #include <new> |
6 #include <utility> | 6 #include <utility> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 ASSERT_EQ(arraysize(kEvents), event_recorder_.record_count()); | 173 ASSERT_EQ(arraysize(kEvents), event_recorder_.record_count()); |
174 EXPECT_EQ(0U, message_recorder_.message_count()); | 174 EXPECT_EQ(0U, message_recorder_.message_count()); |
175 | 175 |
176 for (size_t i = 0; i < arraysize(kEvents); ++i) { | 176 for (size_t i = 0; i < arraysize(kEvents); ++i) { |
177 const IPC::Message* message = ipc_sink_.GetMessageAt(i); | 177 const IPC::Message* message = ipc_sink_.GetMessageAt(i); |
178 EXPECT_EQ(kTestRoutingID, message->routing_id()); | 178 EXPECT_EQ(kTestRoutingID, message->routing_id()); |
179 EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); | 179 EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); |
180 | 180 |
181 InputHostMsg_HandleInputEvent_ACK::Param params; | 181 InputHostMsg_HandleInputEvent_ACK::Param params; |
182 EXPECT_TRUE(InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms)); | 182 EXPECT_TRUE(InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms)); |
183 WebInputEvent::Type event_type = params.a; | 183 WebInputEvent::Type event_type = params.a.type; |
184 InputEventAckState ack_result = params.b; | 184 InputEventAckState ack_result = params.a.state; |
185 | 185 |
186 EXPECT_EQ(kEvents[i].type, event_type); | 186 EXPECT_EQ(kEvents[i].type, event_type); |
187 EXPECT_EQ(ack_result, INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS); | 187 EXPECT_EQ(ack_result, INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS); |
188 | 188 |
189 const WebInputEvent* event = event_recorder_.record_at(i); | 189 const WebInputEvent* event = event_recorder_.record_at(i); |
190 ASSERT_TRUE(event); | 190 ASSERT_TRUE(event); |
191 | 191 |
192 EXPECT_EQ(kEvents[i].size, event->size); | 192 EXPECT_EQ(kEvents[i].size, event->size); |
193 EXPECT_TRUE(memcmp(&kEvents[i], event, event->size) == 0); | 193 EXPECT_TRUE(memcmp(&kEvents[i], event, event->size) == 0); |
194 } | 194 } |
(...skipping 30 matching lines...) Expand all Loading... |
225 EXPECT_EQ(arraysize(kEvents), event_recorder_.record_count()); | 225 EXPECT_EQ(arraysize(kEvents), event_recorder_.record_count()); |
226 EXPECT_EQ(0U, message_recorder_.message_count()); | 226 EXPECT_EQ(0U, message_recorder_.message_count()); |
227 | 227 |
228 for (size_t i = 0; i < arraysize(kEvents); ++i) { | 228 for (size_t i = 0; i < arraysize(kEvents); ++i) { |
229 const IPC::Message* message = ipc_sink_.GetMessageAt(i); | 229 const IPC::Message* message = ipc_sink_.GetMessageAt(i); |
230 EXPECT_EQ(kTestRoutingID, message->routing_id()); | 230 EXPECT_EQ(kTestRoutingID, message->routing_id()); |
231 EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); | 231 EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); |
232 | 232 |
233 InputHostMsg_HandleInputEvent_ACK::Param params; | 233 InputHostMsg_HandleInputEvent_ACK::Param params; |
234 EXPECT_TRUE(InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms)); | 234 EXPECT_TRUE(InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms)); |
235 WebInputEvent::Type event_type = params.a; | 235 WebInputEvent::Type event_type = params.a.type; |
236 InputEventAckState ack_result = params.b; | 236 InputEventAckState ack_result = params.a.state; |
237 EXPECT_EQ(kEvents[i].type, event_type); | 237 EXPECT_EQ(kEvents[i].type, event_type); |
238 EXPECT_EQ(ack_result, INPUT_EVENT_ACK_STATE_CONSUMED); | 238 EXPECT_EQ(ack_result, INPUT_EVENT_ACK_STATE_CONSUMED); |
239 } | 239 } |
240 | 240 |
241 filter_->OnFilterRemoved(); | 241 filter_->OnFilterRemoved(); |
242 } | 242 } |
243 | 243 |
244 TEST_F(InputEventFilterTest, PreserveRelativeOrder) { | 244 TEST_F(InputEventFilterTest, PreserveRelativeOrder) { |
245 filter_->DidAddInputHandler(kTestRoutingID, NULL); | 245 filter_->DidAddInputHandler(kTestRoutingID, NULL); |
246 event_recorder_.set_send_to_widget(true); | 246 event_recorder_.set_send_to_widget(true); |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 | 289 |
290 // We should have sent all messages back to the main thread and preserved | 290 // We should have sent all messages back to the main thread and preserved |
291 // their relative order. | 291 // their relative order. |
292 ASSERT_EQ(message_recorder_.message_count(), messages.size()); | 292 ASSERT_EQ(message_recorder_.message_count(), messages.size()); |
293 for (size_t i = 0; i < messages.size(); ++i) { | 293 for (size_t i = 0; i < messages.size(); ++i) { |
294 EXPECT_EQ(message_recorder_.message_at(i).type(), messages[i].type()) << i; | 294 EXPECT_EQ(message_recorder_.message_at(i).type(), messages[i].type()) << i; |
295 } | 295 } |
296 } | 296 } |
297 | 297 |
298 } // namespace content | 298 } // namespace content |
OLD | NEW |