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

Unified Diff: content/renderer/mus/compositor_mus_connection.cc

Issue 1806703002: Use ui::Event instead of mojom::EventPtr in mus::InputEventHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/mus/compositor_mus_connection.cc
diff --git a/content/renderer/mus/compositor_mus_connection.cc b/content/renderer/mus/compositor_mus_connection.cc
index f469f566ee203770c424d9e0fb416c584da766bb..bd1b844a4839e2cd504b6a5bb37ba4eabc7c4183 100644
--- a/content/renderer/mus/compositor_mus_connection.cc
+++ b/content/renderer/mus/compositor_mus_connection.cc
@@ -9,6 +9,7 @@
#include "content/renderer/input/input_handler_manager.h"
#include "content/renderer/mus/render_widget_mus_connection.h"
#include "mojo/converters/blink/blink_input_events_type_converters.h"
+#include "mojo/converters/input_events/input_events_type_converters.h"
#include "ui/events/latency_info.h"
namespace {
@@ -115,11 +116,12 @@ void CompositorMusConnection::OnEmbed(mus::Window* root) {
void CompositorMusConnection::OnWindowInputEvent(
mus::Window* window,
- mus::mojom::EventPtr event,
+ ui::Event* event,
scoped_ptr<base::Callback<void(bool)>>* ack_callback) {
DCHECK(compositor_task_runner_->BelongsToCurrentThread());
- scoped_ptr<blink::WebInputEvent> web_event =
- event.To<scoped_ptr<blink::WebInputEvent>>();
+ // TODO(moshayedi): Convert ui::Event directly to blink::WebInputEvent.
+ scoped_ptr<blink::WebInputEvent> web_event(
+ mus::mojom::Event::From(*event).To<scoped_ptr<blink::WebInputEvent>>());
// TODO(sad): We probably need to plumb LatencyInfo through Mus.
ui::LatencyInfo info;
InputEventAckState ack_state = input_handler_manager_->HandleInputEvent(

Powered by Google App Engine
This is Rietveld 408576698