Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/ui/views.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 views_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/scenes.mojom.dart' as scenes_mojom;
 import 'package:mojo_services/mojo/ui/view_containers.mojom.dart' as view_containers_mojom;
 import 'package:mojo_services/mojo/ui/view_properties.mojom.dart' as view_properties_mojom;
 import 'package:mojo_services/mojo/ui/view_token.mojom.dart' as view_token_mojom;
 
 
 
 class _ViewGetTokenParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _ViewGetTokenParams() : super(kVersions.last.size);
 
+  _ViewGetTokenParams.init(
+  ) : super(kVersions.last.size);
+
   static _ViewGetTokenParams 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 _ViewGetTokenParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class ViewGetTokenResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   view_token_mojom.ViewToken token = null;
 
   ViewGetTokenResponseParams() : super(kVersions.last.size);
 
+  ViewGetTokenResponseParams.init(
+    view_token_mojom.ViewToken this.token
+  ) : super(kVersions.last.size);
+
   static ViewGetTokenResponseParams 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 ViewGetTokenResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class _ViewGetServiceProviderParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider = null;
 
   _ViewGetServiceProviderParams() : super(kVersions.last.size);
 
+  _ViewGetServiceProviderParams.init(
+    service_provider_mojom.ServiceProviderInterfaceRequest this.serviceProvider
+  ) : super(kVersions.last.size);
+
   static _ViewGetServiceProviderParams 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 _ViewGetServiceProviderParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _ViewCreateSceneParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   scenes_mojom.SceneInterfaceRequest scene = null;
 
   _ViewCreateSceneParams() : super(kVersions.last.size);
 
+  _ViewCreateSceneParams.init(
+    scenes_mojom.SceneInterfaceRequest this.scene
+  ) : super(kVersions.last.size);
+
   static _ViewCreateSceneParams 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 _ViewCreateSceneParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _ViewGetContainerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   view_containers_mojom.ViewContainerInterfaceRequest container = null;
 
   _ViewGetContainerParams() : super(kVersions.last.size);
 
+  _ViewGetContainerParams.init(
+    view_containers_mojom.ViewContainerInterfaceRequest this.container
+  ) : super(kVersions.last.size);
+
   static _ViewGetContainerParams 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 _ViewGetContainerParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 class _ViewListenerOnPropertiesChangedParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   int sceneVersion = 0;
   view_properties_mojom.ViewProperties properties = null;
 
   _ViewListenerOnPropertiesChangedParams() : super(kVersions.last.size);
 
+  _ViewListenerOnPropertiesChangedParams.init(
+    int this.sceneVersion, 
+    view_properties_mojom.ViewProperties this.properties
+  ) : super(kVersions.last.size);
+
   static _ViewListenerOnPropertiesChangedParams 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 _ViewListenerOnPropertiesChangedParams decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 }
 
 
 class ViewListenerOnPropertiesChangedResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   ViewListenerOnPropertiesChangedResponseParams() : super(kVersions.last.size);
 
+  ViewListenerOnPropertiesChangedResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static ViewListenerOnPropertiesChangedResponseParams 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 ViewListenerOnPropertiesChangedResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 36 matching lines @@
     return map;
   }
 }
 
 const int _viewMethodGetTokenName = 0;
 const int _viewMethodGetServiceProviderName = 1;
 const int _viewMethodCreateSceneName = 2;
 const int _viewMethodGetContainerName = 3;
 
 class _ViewServiceDescription 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 View {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ViewProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ViewProxy p = new ViewProxy.unbound();
     String name = serviceName ?? View.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_token_mojom.ViewToken token));
   void getServiceProvider(service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider);
   void createScene(scenes_mojom.SceneInterfaceRequest scene);
   void getContainer(view_containers_mojom.ViewContainerInterfaceRequest container);
 }
 
 abstract class ViewInterface
     implements bindings.MojoInterface<View>,
                View {
   factory ViewInterface([View impl]) =>
       new ViewStub.unbound(impl);
@@ skipping 25 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _viewMethodGetTokenName:
         var r = ViewGetTokenResponseParams.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;
     }
   }
 
   View get impl => null;
   set impl(View _) {
@@ skipping 22 matching lines @@
   ViewProxy.unbound()
       : super(new _ViewProxyControl.unbound());
 
   static ViewProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewProxy"));
     return new ViewProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic getToken([Function responseFactory = null]) {
+  void getToken(void callback(view_token_mojom.ViewToken token)) {
     var params = new _ViewGetTokenParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewMethodGetTokenName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void getServiceProvider(service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider) {
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _ViewGetServiceProviderParams();
     params.serviceProvider = serviceProvider;
     ctrl.sendMessage(params,
         _viewMethodGetServiceProviderName);
@@ skipping 35 matching lines @@
       core.MojoHandle handle, [View impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => View.serviceName;
 
 
-  ViewGetTokenResponseParams _viewGetTokenResponseParamsFactory(view_token_mojom.ViewToken token) {
-    var result = new ViewGetTokenResponseParams();
-    result.token = token;
-    return result;
+  Function _viewGetTokenResponseParamsResponder(
+      int requestId) {
+  return (view_token_mojom.ViewToken token) {
+      var result = new ViewGetTokenResponseParams();
+      result.token = token;
+      sendResponse(buildResponseWithId(
+          result,
+          _viewMethodGetTokenName,
+          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 _viewMethodGetTokenName:
-        var response = _impl.getToken(_viewGetTokenResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewMethodGetTokenName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewMethodGetTokenName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getToken(_viewGetTokenResponseParamsResponder(message.header.requestId));
         break;
       case _viewMethodGetServiceProviderName:
         var params = _ViewGetServiceProviderParams.deserialize(
             message.payload);
         _impl.getServiceProvider(params.serviceProvider);
         break;
       case _viewMethodCreateSceneName:
         var params = _ViewCreateSceneParams.deserialize(
             message.payload);
         _impl.createScene(params.scene);
         break;
       case _viewMethodGetContainerName:
         var params = _ViewGetContainerParams.deserialize(
             message.payload);
         _impl.getContainer(params.container);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   View get impl => _impl;
   set impl(View 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, [View impl])
       : super(new _ViewStubControl.fromHandle(handle, impl));
 
   static ViewStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewStub"));
     return new ViewStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic getToken([Function responseFactory = null]) {
-    return impl.getToken(responseFactory);
+  void getToken(void callback(view_token_mojom.ViewToken token)) {
+    return impl.getToken(callback);
   }
   void getServiceProvider(service_provider_mojom.ServiceProviderInterfaceRequest serviceProvider) {
     return impl.getServiceProvider(serviceProvider);
   }
   void createScene(scenes_mojom.SceneInterfaceRequest scene) {
     return impl.createScene(scene);
   }
   void getContainer(view_containers_mojom.ViewContainerInterfaceRequest container) {
     return impl.getContainer(container);
   }
 }
 
 const int _viewListenerMethodOnPropertiesChangedName = 0;
 
 class _ViewListenerServiceDescription 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 ViewListener {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewListenerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ViewListenerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ViewListenerProxy p = new ViewListenerProxy.unbound();
     String name = serviceName ?? ViewListener.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 onPropertiesChanged(int sceneVersion,view_properties_mojom.ViewProperties properties,[Function responseFactory = null]);
+  void onPropertiesChanged(int sceneVersion,view_properties_mojom.ViewProperties properties,void callback());
 }
 
 abstract class ViewListenerInterface
     implements bindings.MojoInterface<ViewListener>,
                ViewListener {
   factory ViewListenerInterface([ViewListener impl]) =>
       new ViewListenerStub.unbound(impl);
   factory ViewListenerInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
       [ViewListener impl]) =>
@@ skipping 22 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _viewListenerMethodOnPropertiesChangedName:
         var r = ViewListenerOnPropertiesChangedResponseParams.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;
     }
   }
 
   ViewListener get impl => null;
   set impl(ViewListener _) {
@@ skipping 22 matching lines @@
   ViewListenerProxy.unbound()
       : super(new _ViewListenerProxyControl.unbound());
 
   static ViewListenerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewListenerProxy"));
     return new ViewListenerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic onPropertiesChanged(int sceneVersion,view_properties_mojom.ViewProperties properties,[Function responseFactory = null]) {
+  void onPropertiesChanged(int sceneVersion,view_properties_mojom.ViewProperties properties,void callback()) {
     var params = new _ViewListenerOnPropertiesChangedParams();
     params.sceneVersion = sceneVersion;
     params.properties = properties;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewListenerMethodOnPropertiesChangedName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _ViewListenerStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<ViewListener> {
   ViewListener _impl;
 
   _ViewListenerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ViewListener impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewListenerStubControl.fromHandle(
       core.MojoHandle handle, [ViewListener impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewListenerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ViewListener.serviceName;
 
 
-  ViewListenerOnPropertiesChangedResponseParams _viewListenerOnPropertiesChangedResponseParamsFactory() {
-    var result = new ViewListenerOnPropertiesChangedResponseParams();
-    return result;
+  Function _viewListenerOnPropertiesChangedResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new ViewListenerOnPropertiesChangedResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _viewListenerMethodOnPropertiesChangedName,
+          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 _viewListenerMethodOnPropertiesChangedName:
         var params = _ViewListenerOnPropertiesChangedParams.deserialize(
             message.payload);
-        var response = _impl.onPropertiesChanged(params.sceneVersion,params.properties,_viewListenerOnPropertiesChangedResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewListenerMethodOnPropertiesChangedName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewListenerMethodOnPropertiesChangedName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.onPropertiesChanged(params.sceneVersion, params.properties, _viewListenerOnPropertiesChangedResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ViewListener get impl => _impl;
   set impl(ViewListener 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, [ViewListener impl])
       : super(new _ViewListenerStubControl.fromHandle(handle, impl));
 
   static ViewListenerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewListenerStub"));
     return new ViewListenerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic onPropertiesChanged(int sceneVersion,view_properties_mojom.ViewProperties properties,[Function responseFactory = null]) {
-    return impl.onPropertiesChanged(sceneVersion,properties,responseFactory);
+  void onPropertiesChanged(int sceneVersion,view_properties_mojom.ViewProperties properties,void callback()) {
+    return impl.onPropertiesChanged(sceneVersion,properties,callback);
   }
 }