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

Unified Diff: content/renderer/gpu/input_event_filter_unittest.cc

Issue 15920002: Fix WebView compositor input handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review and rebase Created 7 years, 6 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
Index: content/renderer/gpu/input_event_filter_unittest.cc
diff --git a/content/renderer/gpu/input_event_filter_unittest.cc b/content/renderer/gpu/input_event_filter_unittest.cc
index 7fbeafe54cd80f0419721b91b268fedd02ffb053..55e3d7cd8d63969890ed03c79370caac27178c7c 100644
--- a/content/renderer/gpu/input_event_filter_unittest.cc
+++ b/content/renderer/gpu/input_event_filter_unittest.cc
@@ -46,10 +46,10 @@ class InputEventRecorder {
}
InputEventAckState HandleInputEvent(int routing_id,
- const WebInputEvent* event) {
+ const WebInputEvent& event) {
jamesr 2013/06/05 03:57:17 what was wrong with const * ?
jdduke (slow) 2013/06/05 18:46:31 Oh, nothing really. I changed the signature for t
DCHECK_EQ(kTestRoutingID, routing_id);
- records_.push_back(Record(event));
+ records_.push_back(Record(&event));
jamesr 2013/06/05 03:57:17 this makes the const& switch look silly
jdduke (slow) 2013/06/05 18:46:31 Yeah, see above.
if (handle_events_) {
return INPUT_EVENT_ACK_STATE_CONSUMED;
@@ -135,9 +135,11 @@ class InputEventFilterTest : public testing::Test {
virtual void SetUp() OVERRIDE {
filter_ = new InputEventFilter(
&message_recorder_,
- message_loop_.message_loop_proxy(),
+ message_loop_.message_loop_proxy());
+ filter_->SetBoundHandler(
base::Bind(&InputEventRecorder::HandleInputEvent,
base::Unretained(&event_recorder_)));
+
event_recorder_.set_filter(filter_.get());
filter_->OnFilterAdded(&ipc_sink_);
@@ -170,7 +172,7 @@ TEST_F(InputEventFilterTest, Basic) {
EXPECT_EQ(0U, event_recorder_.record_count());
EXPECT_EQ(0U, message_recorder_.message_count());
- filter_->AddRoute(kTestRoutingID);
+ filter_->DidAddInputHandler(kTestRoutingID);
AddEventsToFilter(filter_.get(), kEvents, arraysize(kEvents));
ASSERT_EQ(arraysize(kEvents), ipc_sink_.message_count());
@@ -245,7 +247,7 @@ TEST_F(InputEventFilterTest, Basic) {
}
TEST_F(InputEventFilterTest, PreserveRelativeOrder) {
- filter_->AddRoute(kTestRoutingID);
+ filter_->DidAddInputHandler(kTestRoutingID);
event_recorder_.set_send_to_widget(true);

Powered by Google App Engine
This is Rietveld 408576698