Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

mojo/services/public/js/service_provider.js

Index: mojo/services/public/js/service_provider.js
diff --git a/mojo/services/public/js/service_provider.js b/mojo/services/public/js/service_provider.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c82775049b8a67169b81079a31ea84be31b2aeb
--- /dev/null
+++ b/mojo/services/public/js/service_provider.js
@@ -0,0 +1,118 @@
+// 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.
+
+define("mojo/services/public/js/service_provider", [
+  "mojo/public/interfaces/application/service_provider.mojom",
+  "mojo/public/js/connection",
+  "mojo/public/js/core",
+], function(spInterfaceModule, connectionModule, coreModule) {
+
+  function connectToServiceImpl(serviceName, serviceHandle) {
+    var provider = this.providers_.get(serviceName);
+    if (!provider) {
+      this.pendingRequests_.set(serviceName, serviceHandle);
+      return;
+    }
+
+    var serviceConnection = new connectionModule.Connection(
+      serviceHandle,
+      provider.service.stubClass,
+      provider.service.client && provider.service.client.proxyClass);
+
+    serviceConnection.local.connection$ = serviceConnection;
+    serviceConnection.local.delegate$ =
+      new provider.factory(serviceConnection.remote);
+
+    provider.connections.push(serviceConnection);
+  }
+
+  class ServiceProvider {
+    constructor(service) {
+      this.connections_ = new Map();
+      this.providers_ = new Map();
+      this.pendingRequests_ = new Map();
+      this.connection_ = null;
+
+      if (service instanceof spInterfaceModule.ServiceProvider.proxyClass) {
+        this.connection_ = service.getConnection$();
+      } else {
+        this.handle_ = service; // service is-a MessagePipe handle
+        this.connection_ =  new connectionModule.Connection(
+          this.handle_,
+          spInterfaceModule.ServiceProvider.client.stubClass,
+          spInterfaceModule.ServiceProvider.proxyClass);
+      };
+      this.connection_.local.delegate$ = {
+        connectToService: connectToServiceImpl.bind(this)
+      }
+    }
+
+    provideService(service, factory) {
+      // TODO(hansmuller): if !factory, remove provider and close its
+      // connections.
+      // TODO(hansmuller): if this.connection_ is null, throw an error.
+      var provider = {
+        service: service,
+        factory: factory,
+        connections: [],
+      };
+      this.providers_.set(service.name, provider);
+
+      if (this.pendingRequests_.has(service.name)) {
+        connectToServiceImpl(service.name, pendingRequests_.get(service.name));
+        pendingRequests_.delete(service.name);
+      }
+
+      return this;
+    }
+
+    connectToService(service, client) {
+      // TODO(hansmuler): if service.name isn't defined, throw an error.
+      // TODO(hansmuller): if this.connection_ is null, throw an error.
+      var serviceConnection = this.connections_.get(service.name);
+      if (serviceConnection)
+        return serviceConnection.remote;
+
+      var pipe = coreModule.createMessagePipe();
+      this.connection_.remote.connectToService(service.name, pipe.handle1);
+      var clientClass = client && service.client.stubClass;
+      var serviceConnection = new connectionModule.Connection(
+        pipe.handle0, clientClass, service.proxyClass);
+      if (serviceConnection.local)
+        serviceConnection.local.delegate$ = client;
+
+      this.connections_.set(service.name, serviceConnection);
+      return serviceConnection.remote;
+    };
+
+    close() {
+      if (!this.connection_)
+        return;
+
+      try {
+        // Outgoing connections
+        this.connections_.forEach(function(connection, serviceName) {
+          connection.close();
+        });
+        // Incoming connections
+        this.providers_.forEach(function(provider, serviceName) {
+          provider.connections.forEach(function(connection) {
+            connection.close();
+          });
+        });
+        this.connection_.close();
+      } finally {
+        this.connections_ = null;
+        this.providers_ = null;
+        this.pendingRequests_ = null;
+        this.connection_ = null;
+        this.handle_ = null;
+      }
+    }
+  }
+
+  var exports = {};
+  exports.ServiceProvider = ServiceProvider;
+  return exports;
+});