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

Unified Diff: content/child/navigator_connect/service_port_provider.cc

Issue 1192713004: Update client side navigator.connect API to use ServicePortCollection [2/3] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 5 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
« no previous file with comments | « content/child/navigator_connect/service_port_provider.h ('k') | content/child/webmessageportchannel_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/navigator_connect/service_port_provider.cc
diff --git a/content/child/navigator_connect/service_port_provider.cc b/content/child/navigator_connect/service_port_provider.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3f63b5f90ef974319c42e7914ede3f9d769710c8
--- /dev/null
+++ b/content/child/navigator_connect/service_port_provider.cc
@@ -0,0 +1,130 @@
+// Copyright 2014 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/child/navigator_connect/service_port_provider.h"
+
+#include "base/lazy_instance.h"
+#include "base/single_thread_task_runner.h"
+#include "base/task_runner_util.h"
+#include "content/child/child_thread_impl.h"
+#include "content/child/webmessageportchannel_impl.h"
+#include "content/common/message_port_messages.h"
+#include "content/common/service_port_type_converters.h"
+#include "content/public/common/navigator_connect_client.h"
+#include "mojo/common/common_type_converters.h"
+#include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/platform/modules/navigator_services/WebServicePortProviderClient.h"
+
+namespace content {
+
+namespace {
+
+void ConnectToServiceOnMainThread(
+ mojo::InterfaceRequest<ServicePortService> ptr) {
+ ChildThreadImpl::current()->service_registry()->ConnectToRemoteService(
+ ptr.Pass());
+}
+
+} // namespace
+
+ServicePortProvider::ServicePortProvider(
+ blink::WebServicePortProviderClient* client,
+ const scoped_refptr<base::SingleThreadTaskRunner>& main_loop)
+ : client_(client), binding_(this), main_loop_(main_loop) {
+ DCHECK(client_);
+ AddRef();
+}
+
+void ServicePortProvider::destroy() {
+ Release();
+}
+
+void ServicePortProvider::connect(
+ const blink::WebURL& target_url,
+ const blink::WebString& origin,
+ blink::WebServicePortConnectCallbacks* raw_callbacks) {
+ scoped_ptr<blink::WebServicePortConnectCallbacks> callbacks(raw_callbacks);
+ // base::Unretained is safe here, as the mojo channel will be deleted (and
+ // will wipe its callbacks) before 'this' is deleted.
+ GetServicePortServicePtr()->Connect(
+ target_url.string().utf8(), origin.utf8(),
+ base::Bind(&ServicePortProvider::OnConnectResult, base::Unretained(this),
+ base::Passed(&callbacks)));
+}
+
+void ServicePortProvider::postMessage(
+ blink::WebServicePortID port_id,
+ const blink::WebString& message,
+ blink::WebMessagePortChannelArray* channels) {
+ // TODO(mek): If necesary, handle sending messages as values for system
+ // services.
+
+ // Have to extract IDs for the transferred MessagePorts on the main thread
+ // to make sure all ports have been fully initialized. Actually sending the
+ // message can safely be done on this thread, and using mojo, since there
+ // shouldn't be any other IPCs where ordering matters.
+ scoped_ptr<blink::WebMessagePortChannelArray> channel_array(channels);
+ base::PostTaskAndReplyWithResult(
+ main_loop_.get(), FROM_HERE,
+ base::Bind(
+ &WebMessagePortChannelImpl::ExtractMessagePortIDsWithoutQueueing,
+ base::Passed(&channel_array)),
+ base::Bind(&ServicePortProvider::PostMessageToBrowser, this, port_id,
+ message));
+}
+
+void ServicePortProvider::closePort(blink::WebServicePortID port_id) {
+ GetServicePortServicePtr()->ClosePort(port_id);
+}
+
+void ServicePortProvider::PostMessage(
+ int32_t port_id,
+ const mojo::String& message,
+ mojo::Array<MojoTransferredMessagePortPtr> ports,
+ mojo::Array<int32_t> new_routing_ids) {
+ client_->postMessage(port_id, message.To<base::string16>(),
+ WebMessagePortChannelImpl::CreatePorts(
+ ports.To<std::vector<TransferredMessagePort>>(),
+ new_routing_ids.To<std::vector<int>>(), main_loop_));
+}
+
+ServicePortProvider::~ServicePortProvider() {
+}
+
+void ServicePortProvider::PostMessageToBrowser(
+ int port_id,
+ const base::string16& message,
+ const std::vector<TransferredMessagePort> ports) {
+ GetServicePortServicePtr()->PostMessage(
+ port_id, mojo::String::From(message),
+ mojo::Array<MojoTransferredMessagePortPtr>::From(ports));
+}
+
+void ServicePortProvider::OnConnectResult(
+ scoped_ptr<blink::WebServicePortConnectCallbacks> callbacks,
+ ServicePortConnectResult result,
+ int32_t port_id) {
+ if (result == SERVICE_PORT_CONNECT_RESULT_ACCEPT) {
+ callbacks->onSuccess(new blink::WebServicePortID(port_id));
+ } else {
+ callbacks->onError();
+ }
+}
+
+ServicePortServicePtr& ServicePortProvider::GetServicePortServicePtr() {
+ if (!service_port_service_.get()) {
+ mojo::InterfaceRequest<ServicePortService> request =
+ mojo::GetProxy(&service_port_service_);
+ main_loop_->PostTask(FROM_HERE, base::Bind(&ConnectToServiceOnMainThread,
+ base::Passed(&request)));
+
+ // Setup channel for browser to post events back to this class.
+ ServicePortServiceClientPtr client_ptr;
+ binding_.Bind(GetProxy(&client_ptr));
+ service_port_service_->SetClient(client_ptr.Pass());
+ }
+ return service_port_service_;
+}
+
+} // namespace content
« no previous file with comments | « content/child/navigator_connect/service_port_provider.h ('k') | content/child/webmessageportchannel_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698