Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/ui/view_trees.mojom.dart

 // 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.
 
 library view_trees_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo/mojo/service_provider.mojom.dart' as service_provider_mojom;
 import 'package:mojo_services/mojo/gfx/composition/renderers.mojom.dart' as renderers_mojom;
 import 'package:mojo_services/mojo/ui/view_containers.mojom.dart' as view_containers_mojom;
 import 'package:mojo_services/mojo/ui/view_tree_token.mojom.dart' as view_tree_token_mojom;
 
 
 
 class _ViewTreeGetTokenParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _ViewTreeGetTokenParams() : super(kVersions.last.size);
 
+  _ViewTreeGetTokenParams.init(
+  ) : super(kVersions.last.size);
+
   static _ViewTreeGetTokenParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ViewTreeGetTokenParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class ViewTreeGetTokenResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   view_tree_token_mojom.ViewTreeToken token = null;
 
   ViewTreeGetTokenResponseParams() : super(kVersions.last.size);
 
+  ViewTreeGetTokenResponseParams.init(
+    view_tree_token_mojom.ViewTreeToken this.token
+  ) : super(kVersions.last.size);
+
   static ViewTreeGetTokenResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static ViewTreeGetTokenResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class _ViewTreeGetServiceProviderParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider = null;
 
   _ViewTreeGetServiceProviderParams() : super(kVersions.last.size);
 
+  _ViewTreeGetServiceProviderParams.init(
+    service_provider_mojom.ServiceProviderInterfaceRequest this.serviceProvider
+  ) : super(kVersions.last.size);
+
   static _ViewTreeGetServiceProviderParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ViewTreeGetServiceProviderParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _ViewTreeSetRendererParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   renderers_mojom.RendererInterface renderer = null;
 
   _ViewTreeSetRendererParams() : super(kVersions.last.size);
 
+  _ViewTreeSetRendererParams.init(
+    renderers_mojom.RendererInterface this.renderer
+  ) : super(kVersions.last.size);
+
   static _ViewTreeSetRendererParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ViewTreeSetRendererParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _ViewTreeGetContainerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   view_containers_mojom.ViewContainerInterfaceRequest container = null;
 
   _ViewTreeGetContainerParams() : super(kVersions.last.size);
 
+  _ViewTreeGetContainerParams.init(
+    view_containers_mojom.ViewContainerInterfaceRequest this.container
+  ) : super(kVersions.last.size);
+
   static _ViewTreeGetContainerParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ViewTreeGetContainerParams decode(bindings.Decoder decoder0) {
@@ skipping 50 matching lines @@
 }
 
 
 class _ViewTreeListenerOnRendererDiedParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _ViewTreeListenerOnRendererDiedParams() : super(kVersions.last.size);
 
+  _ViewTreeListenerOnRendererDiedParams.init(
+  ) : super(kVersions.last.size);
+
   static _ViewTreeListenerOnRendererDiedParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ViewTreeListenerOnRendererDiedParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class ViewTreeListenerOnRendererDiedResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   ViewTreeListenerOnRendererDiedResponseParams() : super(kVersions.last.size);
 
+  ViewTreeListenerOnRendererDiedResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static ViewTreeListenerOnRendererDiedResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static ViewTreeListenerOnRendererDiedResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 36 matching lines @@
     return map;
   }
 }
 
 const int _viewTreeMethodGetTokenName = 0;
 const int _viewTreeMethodGetServiceProviderName = 1;
 const int _viewTreeMethodSetRendererName = 2;
 const int _viewTreeMethodGetContainerName = 3;
 
 class _ViewTreeServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class ViewTree {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewTreeServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ViewTreeProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ViewTreeProxy p = new ViewTreeProxy.unbound();
     String name = serviceName ?? ViewTree.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic getToken([Function responseFactory = null]);
+  void getToken(void callback(view_tree_token_mojom.ViewTreeToken token));
   void getServiceProvider(service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider);
   void setRenderer(renderers_mojom.RendererInterface renderer);
   void getContainer(view_containers_mojom.ViewContainerInterfaceRequest container);
 }
 
 abstract class ViewTreeInterface
     implements bindings.MojoInterface<ViewTree>,
                ViewTree {
   factory ViewTreeInterface([ViewTree impl]) =>
       new ViewTreeStub.unbound(impl);
@@ skipping 32 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _viewTreeMethodGetTokenName:
         var r = ViewTreeGetTokenResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.token );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static ViewTreeProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewTreeProxy"));
     return new ViewTreeProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic getToken([Function responseFactory = null]) {
+  void getToken(void callback(view_tree_token_mojom.ViewTreeToken token)) {
     if (impl != null) {
-      return new Future(() => impl.getToken(_ViewTreeStubControl._viewTreeGetTokenResponseParamsFactory));
+      impl.getToken(callback);
+      return;
     }
     var params = new _ViewTreeGetTokenParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewTreeMethodGetTokenName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void getServiceProvider(service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider) {
     if (impl != null) {
       impl.getServiceProvider(serviceProvider);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 47 matching lines @@
       core.MojoHandle handle, [ViewTree impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewTreeStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ViewTree.serviceName;
 
 
-  static ViewTreeGetTokenResponseParams _viewTreeGetTokenResponseParamsFactory(view_tree_token_mojom.ViewTreeToken token) {
-    var result = new ViewTreeGetTokenResponseParams();
-    result.token = token;
-    return result;
+  Function _viewTreeGetTokenResponseParamsResponder(
+      int requestId) {
+  return (view_tree_token_mojom.ViewTreeToken token) {
+      var result = new ViewTreeGetTokenResponseParams();
+      result.token = token;
+      sendResponse(buildResponseWithId(
+          result,
+          _viewTreeMethodGetTokenName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
     }
     switch (message.header.type) {
       case _viewTreeMethodGetTokenName:
-        var response = _impl.getToken(_viewTreeGetTokenResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewTreeMethodGetTokenName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewTreeMethodGetTokenName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getToken(_viewTreeGetTokenResponseParamsResponder(message.header.requestId));
         break;
       case _viewTreeMethodGetServiceProviderName:
         var params = _ViewTreeGetServiceProviderParams.deserialize(
             message.payload);
         _impl.getServiceProvider(params.serviceProvider);
         break;
       case _viewTreeMethodSetRendererName:
         var params = _ViewTreeSetRendererParams.deserialize(
             message.payload);
         _impl.setRenderer(params.renderer);
         break;
       case _viewTreeMethodGetContainerName:
         var params = _ViewTreeGetContainerParams.deserialize(
             message.payload);
         _impl.getContainer(params.container);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ViewTree get impl => _impl;
   set impl(ViewTree d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [ViewTree impl])
       : super(new _ViewTreeStubControl.fromHandle(handle, impl));
 
   static ViewTreeStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewTreeStub"));
     return new ViewTreeStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic getToken([Function responseFactory = null]) {
-    return impl.getToken(responseFactory);
+  void getToken(void callback(view_tree_token_mojom.ViewTreeToken token)) {
+    return impl.getToken(callback);
   }
   void getServiceProvider(service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider) {
     return impl.getServiceProvider(serviceProvider);
   }
   void setRenderer(renderers_mojom.RendererInterface renderer) {
     return impl.setRenderer(renderer);
   }
   void getContainer(view_containers_mojom.ViewContainerInterfaceRequest container) {
     return impl.getContainer(container);
   }
 }
 
 const int _viewTreeListenerMethodOnRendererDiedName = 0;
 
 class _ViewTreeListenerServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class ViewTreeListener {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewTreeListenerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ViewTreeListenerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ViewTreeListenerProxy p = new ViewTreeListenerProxy.unbound();
     String name = serviceName ?? ViewTreeListener.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic onRendererDied([Function responseFactory = null]);
+  void onRendererDied(void callback());
 }
 
 abstract class ViewTreeListenerInterface
     implements bindings.MojoInterface<ViewTreeListener>,
                ViewTreeListener {
   factory ViewTreeListenerInterface([ViewTreeListener impl]) =>
       new ViewTreeListenerStub.unbound(impl);
 
   factory ViewTreeListenerInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
@@ skipping 29 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _viewTreeListenerMethodOnRendererDiedName:
         var r = ViewTreeListenerOnRendererDiedResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static ViewTreeListenerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewTreeListenerProxy"));
     return new ViewTreeListenerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic onRendererDied([Function responseFactory = null]) {
+  void onRendererDied(void callback()) {
     if (impl != null) {
-      return new Future(() => impl.onRendererDied(_ViewTreeListenerStubControl._viewTreeListenerOnRendererDiedResponseParamsFactory));
+      impl.onRendererDied(callback);
+      return;
     }
     var params = new _ViewTreeListenerOnRendererDiedParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewTreeListenerMethodOnRendererDiedName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _ViewTreeListenerStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<ViewTreeListener> {
   ViewTreeListener _impl;
 
   _ViewTreeListenerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ViewTreeListener impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewTreeListenerStubControl.fromHandle(
       core.MojoHandle handle, [ViewTreeListener impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewTreeListenerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ViewTreeListener.serviceName;
 
 
-  static ViewTreeListenerOnRendererDiedResponseParams _viewTreeListenerOnRendererDiedResponseParamsFactory() {
-    var result = new ViewTreeListenerOnRendererDiedResponseParams();
-    return result;
+  Function _viewTreeListenerOnRendererDiedResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new ViewTreeListenerOnRendererDiedResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _viewTreeListenerMethodOnRendererDiedName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
     }
     switch (message.header.type) {
       case _viewTreeListenerMethodOnRendererDiedName:
-        var response = _impl.onRendererDied(_viewTreeListenerOnRendererDiedResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewTreeListenerMethodOnRendererDiedName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewTreeListenerMethodOnRendererDiedName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.onRendererDied(_viewTreeListenerOnRendererDiedResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ViewTreeListener get impl => _impl;
   set impl(ViewTreeListener d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [ViewTreeListener impl])
       : super(new _ViewTreeListenerStubControl.fromHandle(handle, impl));
 
   static ViewTreeListenerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewTreeListenerStub"));
     return new ViewTreeListenerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic onRendererDied([Function responseFactory = null]) {
-    return impl.onRendererDied(responseFactory);
+  void onRendererDied(void callback()) {
+    return impl.onRendererDied(callback);
   }
 }