OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "blimp/engine/feature/engine_render_widget_feature.h" | 5 #include "blimp/engine/feature/engine_render_widget_feature.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 return arg.target_tab_id() == tab_id && | 156 return arg.target_tab_id() == tab_id && |
157 arg.ime().render_widget_id() == rwid && | 157 arg.ime().render_widget_id() == rwid && |
158 arg.ime().type() == message_type && | 158 arg.ime().type() == message_type && |
159 arg.ime().ime_text().compare(text) == 0 && | 159 arg.ime().ime_text().compare(text) == 0 && |
160 arg.ime().text_input_type() == text_input_type; | 160 arg.ime().text_input_type() == text_input_type; |
161 } | 161 } |
162 | 162 |
163 void SendInputMessage(BlimpMessageProcessor* processor, | 163 void SendInputMessage(BlimpMessageProcessor* processor, |
164 int tab_id, | 164 int tab_id, |
165 int rw_id) { | 165 int rw_id) { |
166 blink::WebGestureEvent input_event; | 166 blink::WebGestureEvent input_event(blink::WebGestureEvent::Type::GestureTap, |
167 input_event.type = blink::WebGestureEvent::Type::GestureTap; | 167 blink::WebInputEvent::NoModifiers, |
| 168 blink::WebInputEvent::TimeStampForTesting); |
168 | 169 |
169 InputMessageGenerator generator; | 170 InputMessageGenerator generator; |
170 std::unique_ptr<BlimpMessage> message = | 171 std::unique_ptr<BlimpMessage> message = |
171 generator.GenerateMessage(input_event); | 172 generator.GenerateMessage(input_event); |
172 message->set_target_tab_id(tab_id); | 173 message->set_target_tab_id(tab_id); |
173 message->mutable_input()->set_render_widget_id(rw_id); | 174 message->mutable_input()->set_render_widget_id(rw_id); |
174 | 175 |
175 net::TestCompletionCallback cb; | 176 net::TestCompletionCallback cb; |
176 processor->ProcessMessage(std::move(message), cb.callback()); | 177 processor->ProcessMessage(std::move(message), cb.callback()); |
177 EXPECT_EQ(net::OK, cb.WaitForResult()); | 178 EXPECT_EQ(net::OK, cb.WaitForResult()); |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 | 341 |
341 feature_.OnRenderWidgetCreated(1, &render_widget_host1_); | 342 feature_.OnRenderWidgetCreated(1, &render_widget_host1_); |
342 feature_.OnRenderWidgetCreated(2, &render_widget_host2_); | 343 feature_.OnRenderWidgetCreated(2, &render_widget_host2_); |
343 feature_.OnRenderWidgetInitialized(1, &render_widget_host1_); | 344 feature_.OnRenderWidgetInitialized(1, &render_widget_host1_); |
344 feature_.OnRenderWidgetDeleted(2, &render_widget_host2_); | 345 feature_.OnRenderWidgetDeleted(2, &render_widget_host2_); |
345 feature_.SendCompositorMessage(1, &render_widget_host1_, payload); | 346 feature_.SendCompositorMessage(1, &render_widget_host1_, payload); |
346 } | 347 } |
347 | 348 |
348 } // namespace engine | 349 } // namespace engine |
349 } // namespace blimp | 350 } // namespace blimp |
OLD | NEW |