Merge the mojo blink type converter into ui/events/blink

content/renderer/mus/compositor_mus_connection.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/mus/compositor_mus_connection.h"
 
 #include "base/single_thread_task_runner.h"
 #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 "ui/events/blink/blink_event_util.h"
 #include "ui/events/blink/did_overscroll_params.h"
+#include "ui/events/blink/web_input_event.h"
 #include "ui/events/blink/web_input_event_traits.h"
 #include "ui/events/latency_info.h"
 #include "ui/events/mojo/event.mojom.h"
 
 using ui::mojom::EventResult;
 
 namespace {
 
 void DoNothingWithEventResult(EventResult result) {}
 
+gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) {
+  return event.root_location();
+}
+
 }  // namespace
 
 namespace content {
 
 CompositorMusConnection::CompositorMusConnection(
     int routing_id,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
     const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
     mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request,
     InputHandlerManager* input_handler_manager)
@@ skipping 86 matching lines @@
     const ui::PointerEvent& event,
     ui::Window* target) {
   // Compositor does not use StartPointerWatcher().
 }
 
 void CompositorMusConnection::OnWindowInputEvent(
     ui::Window* window,
     const ui::Event& event,
     std::unique_ptr<base::Callback<void(EventResult)>>* ack_callback) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
-  std::unique_ptr<blink::WebInputEvent> web_event(
-      mojo::TypeConverter<std::unique_ptr<blink::WebInputEvent>,
-                          ui::Event>::Convert(event));
+  std::unique_ptr<blink::WebInputEvent> web_event(Convert(event));
   // TODO(sad): We probably need to plumb LatencyInfo through Mus.
   ui::LatencyInfo info;
   InputEventAckState ack_state = input_handler_manager_->HandleInputEvent(
       routing_id_, web_event.get(), &info);
   // TODO(jonross): We probably need to ack the event based on the consumed
   // state.
   if (ack_state != INPUT_EVENT_ACK_STATE_NOT_CONSUMED)
     return;
   base::Callback<void(EventResult)> ack =
       base::Bind(&::DoNothingWithEventResult);
   const bool send_ack =
       ui::WebInputEventTraits::ShouldBlockEventStream(*web_event);
   if (send_ack) {
     // Ultimately, this ACK needs to go back to the Mus client lib which is not
     // thread-safe and lives on the compositor thread. For ACKs that are passed
     // to the main thread we pass them back to the compositor thread via
     // OnWindowInputEventAckOnMainThread.
     ack =
         base::Bind(&CompositorMusConnection::OnWindowInputEventAckOnMainThread,
                    this, *ack_callback->get());
     ack_callback->reset();
   }
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this,
                  base::Passed(std::move(web_event)), ack));
 }
 
+std::unique_ptr<blink::WebInputEvent> CompositorMusConnection::Convert(
+    const ui::Event& event) {
+  if (event.IsMousePointerEvent()) {
+    const ui::MouseEvent mouse_event(*event.AsPointerEvent());
+    blink::WebMouseEvent blink_event = ui::MakeWebMouseEvent(
+        mouse_event, base::Bind(&GetScreenLocationFromEvent));
+    return base::WrapUnique(new blink::WebMouseEvent(blink_event));

[sadrul, 2016/08/26 02:37:02]

Would "return base::MakeUnique<blink::WebMouseEvent>(blink_event);" work here?

[jonross, 2016/08/26 14:33:50]

Done.

+  } else if (event.IsTouchPointerEvent()) {
+    ui::TouchEvent touch_event(*event.AsPointerEvent());
+    pointer_state_.OnTouch(touch_event);
+    blink::WebTouchEvent blink_event = ui::CreateWebTouchEventFromMotionEvent(
+        pointer_state_, touch_event.may_cause_scrolling());
+    pointer_state_.CleanupRemovedTouchPoints(touch_event);
+    return base::WrapUnique(new blink::WebTouchEvent(blink_event));
+  } else if (event.IsMouseWheelEvent()) {
+    blink::WebMouseWheelEvent blink_event = ui::MakeWebMouseWheelEvent(
+        *event.AsMouseWheelEvent(), base::Bind(&GetScreenLocationFromEvent));
+    return base::WrapUnique(new blink::WebMouseWheelEvent(blink_event));

[sadrul, 2016/08/26 02:37:02]

We will be getting PointerEvents for wheel-events soon
(https://codereview.chromium.org/2256343003/). Maybe leave this out, and update
the code above for mouse-events instead?

[jonross, 2016/08/26 14:33:50]

Added a comment on that review. I'll redo this section accordingly (either using
the requested event helper, or doing a two stage check like in the current
converter)

+  } else if (event.IsKeyEvent()) {
+    blink::WebKeyboardEvent blink_event =
+        ui::MakeWebKeyboardEvent(*event.AsKeyEvent());
+    return base::WrapUnique(new blink::WebKeyboardEvent(blink_event));
+  } else {
+    return nullptr;
+  }

[sadrul, 2016/08/26 02:37:02]

This entire block doesn't need any else, since each block ends with a return.

[jonross, 2016/08/26 14:33:50]

Done.

+}
+
 }  // namespace content