Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/scenes.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/scenes.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/scenes.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/scenes.mojom.dart
index e8b74bb52772554dfc757ce6008f41235a03577c..598bd5777dc612c1a1ed8b07465767ec1f871c91 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/scenes.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/scenes.mojom.dart
@@ -26,6 +26,13 @@ class SceneUpdate extends bindings.Struct {
 
   SceneUpdate() : super(kVersions.last.size);
 
+  SceneUpdate.init(
+    bool this.clearResources, 
+    bool this.clearNodes, 
+    Map<int, resources_mojom.Resource> this.resources, 
+    Map<int, nodes_mojom.Node> this.nodes
+  ) : super(kVersions.last.size);
+
   static SceneUpdate deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -213,6 +220,11 @@ class SceneMetadata extends bindings.Struct {
 
   SceneMetadata() : super(kVersions.last.size);
 
+  SceneMetadata.init(
+    int this.version, 
+    int this.presentationTime
+  ) : super(kVersions.last.size);
+
   static SceneMetadata deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -298,6 +310,10 @@ class _SceneSetListenerParams extends bindings.Struct {
 
   _SceneSetListenerParams() : super(kVersions.last.size);
 
+  _SceneSetListenerParams.init(
+    SceneListenerInterface this.listener
+  ) : super(kVersions.last.size);
+
   static _SceneSetListenerParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -369,6 +385,10 @@ class _SceneUpdateParams extends bindings.Struct {
 
   _SceneUpdateParams() : super(kVersions.last.size);
 
+  _SceneUpdateParams.init(
+    SceneUpdate this.update
+  ) : super(kVersions.last.size);
+
   static _SceneUpdateParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -441,6 +461,10 @@ class _ScenePublishParams extends bindings.Struct {
 
   _ScenePublishParams() : super(kVersions.last.size);
 
+  _ScenePublishParams.init(
+    SceneMetadata this.metadata
+  ) : super(kVersions.last.size);
+
   static _ScenePublishParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -514,6 +538,10 @@ class _SceneGetSchedulerParams extends bindings.Struct {
 
   _SceneGetSchedulerParams() : super(kVersions.last.size);
 
+  _SceneGetSchedulerParams.init(
+    scheduling_mojom.FrameSchedulerInterfaceRequest this.scheduler
+  ) : super(kVersions.last.size);
+
   static _SceneGetSchedulerParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -585,6 +613,10 @@ class _SceneListenerOnResourceUnavailableParams extends bindings.Struct {
 
   _SceneListenerOnResourceUnavailableParams() : super(kVersions.last.size);
 
+  _SceneListenerOnResourceUnavailableParams.init(
+    int this.resourceId
+  ) : super(kVersions.last.size);
+
   static _SceneListenerOnResourceUnavailableParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -656,6 +688,9 @@ class SceneListenerOnResourceUnavailableResponseParams extends bindings.Struct {
 
   SceneListenerOnResourceUnavailableResponseParams() : super(kVersions.last.size);
 
+  SceneListenerOnResourceUnavailableResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static SceneListenerOnResourceUnavailableResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -712,14 +747,17 @@ const int _sceneMethodPublishName = 2;
 const int _sceneMethodGetSchedulerName = 3;
 
 class _SceneServiceDescription 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 Scene {
@@ -914,11 +952,11 @@ class _SceneStubControl
 
 
 
-  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");
@@ -948,7 +986,6 @@ class _SceneStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Scene get impl => _impl;
@@ -1019,14 +1056,17 @@ class SceneStub
 const int _sceneListenerMethodOnResourceUnavailableName = 0;
 
 class _SceneListenerServiceDescription 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 SceneListener {
@@ -1051,7 +1091,7 @@ abstract class SceneListener {
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic onResourceUnavailable(int resourceId,[Function responseFactory = null]);
+  void onResourceUnavailable(int resourceId,void callback());
 }
 
 abstract class SceneListenerInterface
@@ -1101,18 +1141,14 @@ class _SceneListenerProxyControl
           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}");
@@ -1157,17 +1193,19 @@ class SceneListenerProxy
   }
 
 
-  dynamic onResourceUnavailable(int resourceId,[Function responseFactory = null]) {
+  void onResourceUnavailable(int resourceId,void callback()) {
     if (impl != null) {
-      return new Future(() => impl.onResourceUnavailable(resourceId,_SceneListenerStubControl._sceneListenerOnResourceUnavailableResponseParamsFactory));
+      impl.onResourceUnavailable(resourceId,callback);
+      return;
     }
     var params = new _SceneListenerOnResourceUnavailableParams();
     params.resourceId = resourceId;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _sceneListenerMethodOnResourceUnavailableName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
@@ -1193,16 +1231,23 @@ class _SceneListenerStubControl
   String get serviceName => SceneListener.serviceName;
 
 
-  static SceneListenerOnResourceUnavailableResponseParams _sceneListenerOnResourceUnavailableResponseParamsFactory() {
-    var result = new SceneListenerOnResourceUnavailableResponseParams();
-    return result;
+  Function _sceneListenerOnResourceUnavailableResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new SceneListenerOnResourceUnavailableResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _sceneListenerMethodOnResourceUnavailableName,
+          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");
@@ -1211,30 +1256,12 @@ class _SceneListenerStubControl
       case _sceneListenerMethodOnResourceUnavailableName:
         var params = _SceneListenerOnResourceUnavailableParams.deserialize(
             message.payload);
-        var response = _impl.onResourceUnavailable(params.resourceId,_sceneListenerOnResourceUnavailableResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _sceneListenerMethodOnResourceUnavailableName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _sceneListenerMethodOnResourceUnavailableName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.onResourceUnavailable(params.resourceId, _sceneListenerOnResourceUnavailableResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   SceneListener get impl => _impl;
@@ -1288,8 +1315,8 @@ class SceneListenerStub
   }
 
 
-  dynamic onResourceUnavailable(int resourceId,[Function responseFactory = null]) {
-    return impl.onResourceUnavailable(resourceId,responseFactory);
+  void onResourceUnavailable(int resourceId,void callback()) {
+    return impl.onResourceUnavailable(resourceId,callback);
   }
 }