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

Unified Diff: content/renderer/compositor_mus_connection.cc

Issue 1484013003: mustash: Implement basic input event routing in renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed dependency for unit test Created 5 years 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
« no previous file with comments | « content/renderer/compositor_mus_connection.h ('k') | content/renderer/render_widget_mus_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/compositor_mus_connection.cc
diff --git a/content/renderer/compositor_mus_connection.cc b/content/renderer/compositor_mus_connection.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bb3c7e577934fcedf27e6b14b7dc894e6208605a
--- /dev/null
+++ b/content/renderer/compositor_mus_connection.cc
@@ -0,0 +1,139 @@
+// 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/compositor_mus_connection.h"
+
+#include "base/single_thread_task_runner.h"
+#include "content/common/input/web_input_event_traits.h"
+#include "content/renderer/input/input_handler_manager.h"
+#include "content/renderer/render_widget_mus_connection.h"
+#include "mojo/converters/blink/blink_input_events_type_converters.h"
+#include "ui/events/latency_info.h"
+
+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<mus::mojom::WindowTreeClient> request,
+ InputHandlerManager* input_handler_manager)
+ : routing_id_(routing_id),
+ root_(nullptr),
+ main_task_runner_(main_task_runner),
+ compositor_task_runner_(compositor_task_runner),
+ input_handler_manager_(input_handler_manager) {
+ DCHECK(main_task_runner_->BelongsToCurrentThread());
+ compositor_task_runner_->PostTask(
+ FROM_HERE, base::Bind(&CompositorMusConnection::
+ CreateWindowTreeConnectionOnCompositorThread,
+ this, base::Passed(std::move(request))));
+}
+
+void CompositorMusConnection::AttachSurfaceOnMainThread(
+ scoped_ptr<mus::WindowSurfaceBinding> surface_binding) {
+ DCHECK(main_task_runner_->BelongsToCurrentThread());
+ compositor_task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&CompositorMusConnection::AttachSurfaceOnCompositorThread,
+ this, base::Passed(std::move(surface_binding))));
+}
+
+CompositorMusConnection::~CompositorMusConnection() {}
+
+void CompositorMusConnection::AttachSurfaceOnCompositorThread(
+ scoped_ptr<mus::WindowSurfaceBinding> surface_binding) {
+ DCHECK(compositor_task_runner_->BelongsToCurrentThread());
+ window_surface_binding_ = std::move(surface_binding);
+ if (root_) {
+ root_->AttachSurface(mus::mojom::SURFACE_TYPE_DEFAULT,
+ std::move(window_surface_binding_));
+ }
+}
+
+void CompositorMusConnection::CreateWindowTreeConnectionOnCompositorThread(
+ mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) {
+ DCHECK(compositor_task_runner_->BelongsToCurrentThread());
+ mus::WindowTreeConnection::Create(
+ this, std::move(request),
+ mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
+}
+
+void CompositorMusConnection::OnConnectionLostOnMainThread() {
+ DCHECK(main_task_runner_->BelongsToCurrentThread());
+ RenderWidgetMusConnection* connection =
+ RenderWidgetMusConnection::Get(routing_id_);
+ if (!connection)
+ return;
+ connection->OnConnectionLost();
+}
+
+void CompositorMusConnection::OnWindowInputEventOnMainThread(
+ scoped_ptr<blink::WebInputEvent> web_event,
+ const base::Closure& ack) {
+ DCHECK(main_task_runner_->BelongsToCurrentThread());
+ RenderWidgetMusConnection* connection =
+ RenderWidgetMusConnection::Get(routing_id_);
+ if (!connection) {
+ ack.Run();
+ return;
+ }
+ connection->OnWindowInputEvent(std::move(web_event), ack);
+}
+
+void CompositorMusConnection::OnWindowInputEventAckOnMainThread(
+ const base::Closure& ack) {
+ DCHECK(main_task_runner_->BelongsToCurrentThread());
+ compositor_task_runner_->PostTask(FROM_HERE, ack);
+}
+
+void CompositorMusConnection::OnConnectionLost(
+ mus::WindowTreeConnection* connection) {
+ DCHECK(compositor_task_runner_->BelongsToCurrentThread());
+ main_task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&CompositorMusConnection::OnConnectionLostOnMainThread, this));
+}
+
+void CompositorMusConnection::OnEmbed(mus::Window* root) {
+ DCHECK(compositor_task_runner_->BelongsToCurrentThread());
+ root_ = root;
+ root_->AddObserver(this);
+ if (window_surface_binding_) {
+ root->AttachSurface(mus::mojom::SURFACE_TYPE_DEFAULT,
+ std::move(window_surface_binding_));
+ }
+}
+
+void CompositorMusConnection::OnWindowInputEvent(
+ mus::Window* window,
+ const mus::mojom::EventPtr& event) {
+ DCHECK(compositor_task_runner_->BelongsToCurrentThread());
+ scoped_ptr<blink::WebInputEvent> web_event =
+ 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(
+ routing_id_, web_event.get(), &info);
+ if (ack_state != INPUT_EVENT_ACK_STATE_NOT_CONSUMED)
+ return;
+ // TODO(sad): Do something more useful once we can do async acks.
+ base::Closure ack = base::Bind(&base::DoNothing);
+ const bool send_ack =
+ WebInputEventTraits::WillReceiveAckFromRenderer(*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);
+ }
+ main_task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this,
+ base::Passed(std::move(web_event)), ack));
+}
+
+} // namespace content
« no previous file with comments | « content/renderer/compositor_mus_connection.h ('k') | content/renderer/render_widget_mus_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698