Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/surfaces.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 surfaces_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_services/mojo/geometry.mojom.dart' as geometry_mojom;
@@ skipping 89 matching lines @@
 
 
 class Mailbox extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<int> name = null;
 
   Mailbox() : super(kVersions.last.size);
 
+  Mailbox.init(
+    List<int> this.name
+  ) : super(kVersions.last.size);
+
   static Mailbox 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 Mailbox decode(bindings.Decoder decoder0) {
@@ skipping 54 matching lines @@
 class MailboxHolder extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   Mailbox mailbox = null;
   int textureTarget = 0;
   int syncPoint = 0;
 
   MailboxHolder() : super(kVersions.last.size);
 
+  MailboxHolder.init(
+    Mailbox this.mailbox, 
+    int this.textureTarget, 
+    int this.syncPoint
+  ) : super(kVersions.last.size);
+
   static MailboxHolder 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 MailboxHolder decode(bindings.Decoder decoder0) {
@@ skipping 85 matching lines @@
   int id = 0;
   ResourceFormat format = null;
   int filter = 0;
   bool isRepeated = false;
   bool isSoftware = false;
   geometry_mojom.Size size = null;
   MailboxHolder mailboxHolder = null;
 
   TransferableResource() : super(kVersions.last.size);
 
+  TransferableResource.init(
+    int this.id, 
+    ResourceFormat this.format, 
+    int this.filter, 
+    bool this.isRepeated, 
+    bool this.isSoftware, 
+    geometry_mojom.Size this.size, 
+    MailboxHolder this.mailboxHolder
+  ) : super(kVersions.last.size);
+
   static TransferableResource 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 TransferableResource decode(bindings.Decoder decoder0) {
@@ skipping 139 matching lines @@
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   int id = 0;
   int syncPoint = 0;
   int count = 0;
   bool lost = false;
 
   ReturnedResource() : super(kVersions.last.size);
 
+  ReturnedResource.init(
+    int this.id, 
+    int this.syncPoint, 
+    int this.count, 
+    bool this.lost
+  ) : super(kVersions.last.size);
+
   static ReturnedResource 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 ReturnedResource decode(bindings.Decoder decoder0) {
@@ skipping 92 matching lines @@
 
 class Frame extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   List<TransferableResource> resources = null;
   List<quads_mojom.Pass> passes = null;
 
   Frame() : super(kVersions.last.size);
 
+  Frame.init(
+    List<TransferableResource> this.resources, 
+    List<quads_mojom.Pass> this.passes
+  ) : super(kVersions.last.size);
+
   static Frame 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 Frame decode(bindings.Decoder decoder0) {
@@ skipping 97 matching lines @@
 
 
 class _ResourceReturnerReturnResourcesParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<ReturnedResource> resources = null;
 
   _ResourceReturnerReturnResourcesParams() : super(kVersions.last.size);
 
+  _ResourceReturnerReturnResourcesParams.init(
+    List<ReturnedResource> this.resources
+  ) : super(kVersions.last.size);
+
   static _ResourceReturnerReturnResourcesParams 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 _ResourceReturnerReturnResourcesParams decode(bindings.Decoder decoder0) {
@@ skipping 67 matching lines @@
 }
 
 
 class _SurfaceGetIdNamespaceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _SurfaceGetIdNamespaceParams() : super(kVersions.last.size);
 
+  _SurfaceGetIdNamespaceParams.init(
+  ) : super(kVersions.last.size);
+
   static _SurfaceGetIdNamespaceParams 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 _SurfaceGetIdNamespaceParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class SurfaceGetIdNamespaceResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int idNamespace = 0;
 
   SurfaceGetIdNamespaceResponseParams() : super(kVersions.last.size);
 
+  SurfaceGetIdNamespaceResponseParams.init(
+    int this.idNamespace
+  ) : super(kVersions.last.size);
+
   static SurfaceGetIdNamespaceResponseParams 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 SurfaceGetIdNamespaceResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class _SurfaceSetResourceReturnerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   ResourceReturnerInterface returner = null;
 
   _SurfaceSetResourceReturnerParams() : super(kVersions.last.size);
 
+  _SurfaceSetResourceReturnerParams.init(
+    ResourceReturnerInterface this.returner
+  ) : super(kVersions.last.size);
+
   static _SurfaceSetResourceReturnerParams 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 _SurfaceSetResourceReturnerParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _SurfaceCreateSurfaceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int idLocal = 0;
 
   _SurfaceCreateSurfaceParams() : super(kVersions.last.size);
 
+  _SurfaceCreateSurfaceParams.init(
+    int this.idLocal
+  ) : super(kVersions.last.size);
+
   static _SurfaceCreateSurfaceParams 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 _SurfaceCreateSurfaceParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 class _SurfaceSubmitFrameParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   int idLocal = 0;
   Frame frame = null;
 
   _SurfaceSubmitFrameParams() : super(kVersions.last.size);
 
+  _SurfaceSubmitFrameParams.init(
+    int this.idLocal, 
+    Frame this.frame
+  ) : super(kVersions.last.size);
+
   static _SurfaceSubmitFrameParams 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 _SurfaceSubmitFrameParams decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 }
 
 
 class SurfaceSubmitFrameResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   SurfaceSubmitFrameResponseParams() : super(kVersions.last.size);
 
+  SurfaceSubmitFrameResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static SurfaceSubmitFrameResponseParams 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 SurfaceSubmitFrameResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class _SurfaceDestroySurfaceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int idLocal = 0;
 
   _SurfaceDestroySurfaceParams() : super(kVersions.last.size);
 
+  _SurfaceDestroySurfaceParams.init(
+    int this.idLocal
+  ) : super(kVersions.last.size);
+
   static _SurfaceDestroySurfaceParams 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 _SurfaceDestroySurfaceParams decode(bindings.Decoder decoder0) {
@@ skipping 46 matching lines @@
   Map toJson() {
     Map map = new Map();
     map["idLocal"] = idLocal;
     return map;
   }
 }
 
 const int _resourceReturnerMethodReturnResourcesName = 0;
 
 class _ResourceReturnerServiceDescription 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 ResourceReturner {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ResourceReturnerServiceDescription();
     }
@@ skipping 129 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ResourceReturnerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ResourceReturner.serviceName;
 
 
 
-  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 _resourceReturnerMethodReturnResourcesName:
         var params = _ResourceReturnerReturnResourcesParams.deserialize(
             message.payload);
         _impl.returnResources(params.resources);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ResourceReturner get impl => _impl;
   set impl(ResourceReturner d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 45 matching lines @@
   }
 }
 
 const int _surfaceMethodGetIdNamespaceName = 0;
 const int _surfaceMethodSetResourceReturnerName = 1;
 const int _surfaceMethodCreateSurfaceName = 2;
 const int _surfaceMethodSubmitFrameName = 3;
 const int _surfaceMethodDestroySurfaceName = 4;
 
 class _SurfaceServiceDescription 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 Surface {
   static const String serviceName = "mojo::Surface";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _SurfaceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static SurfaceProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     SurfaceProxy p = new SurfaceProxy.unbound();
     String name = serviceName ?? Surface.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 getIdNamespace([Function responseFactory = null]);
+  void getIdNamespace(void callback(int idNamespace));
   void setResourceReturner(ResourceReturnerInterface returner);
   void createSurface(int idLocal);
-  dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]);
+  void submitFrame(int idLocal,Frame frame,void callback());
   void destroySurface(int idLocal);
 }
 
 abstract class SurfaceInterface
     implements bindings.MojoInterface<Surface>,
                Surface {
   factory SurfaceInterface([Surface impl]) =>
       new SurfaceStub.unbound(impl);
 
   factory SurfaceInterface.fromEndpoint(
@@ skipping 30 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _surfaceMethodGetIdNamespaceName:
         var r = SurfaceGetIdNamespaceResponseParams.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.idNamespace );
         break;
       case _surfaceMethodSubmitFrameName:
         var r = SurfaceSubmitFrameResponseParams.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 SurfaceProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For SurfaceProxy"));
     return new SurfaceProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic getIdNamespace([Function responseFactory = null]) {
+  void getIdNamespace(void callback(int idNamespace)) {
     if (impl != null) {
-      return new Future(() => impl.getIdNamespace(_SurfaceStubControl._surfaceGetIdNamespaceResponseParamsFactory));
+      impl.getIdNamespace(callback);
+      return;
     }
     var params = new _SurfaceGetIdNamespaceParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _surfaceMethodGetIdNamespaceName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void setResourceReturner(ResourceReturnerInterface returner) {
     if (impl != null) {
       impl.setResourceReturner(returner);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _SurfaceSetResourceReturnerParams();
     params.returner = returner;
     ctrl.sendMessage(params,
         _surfaceMethodSetResourceReturnerName);
   }
   void createSurface(int idLocal) {
     if (impl != null) {
       impl.createSurface(idLocal);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _SurfaceCreateSurfaceParams();
     params.idLocal = idLocal;
     ctrl.sendMessage(params,
         _surfaceMethodCreateSurfaceName);
   }
-  dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]) {
+  void submitFrame(int idLocal,Frame frame,void callback()) {
     if (impl != null) {
-      return new Future(() => impl.submitFrame(idLocal,frame,_SurfaceStubControl._surfaceSubmitFrameResponseParamsFactory));
+      impl.submitFrame(idLocal,frame,callback);
+      return;
     }
     var params = new _SurfaceSubmitFrameParams();
     params.idLocal = idLocal;
     params.frame = frame;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _surfaceMethodSubmitFrameName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void destroySurface(int idLocal) {
     if (impl != null) {
       impl.destroySurface(idLocal);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 19 matching lines @@
       core.MojoHandle handle, [Surface impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _SurfaceStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => Surface.serviceName;
 
 
-  static SurfaceGetIdNamespaceResponseParams _surfaceGetIdNamespaceResponseParamsFactory(int idNamespace) {
-    var result = new SurfaceGetIdNamespaceResponseParams();
-    result.idNamespace = idNamespace;
-    return result;
+  Function _surfaceGetIdNamespaceResponseParamsResponder(
+      int requestId) {
+  return (int idNamespace) {
+      var result = new SurfaceGetIdNamespaceResponseParams();
+      result.idNamespace = idNamespace;
+      sendResponse(buildResponseWithId(
+          result,
+          _surfaceMethodGetIdNamespaceName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static SurfaceSubmitFrameResponseParams _surfaceSubmitFrameResponseParamsFactory() {
-    var result = new SurfaceSubmitFrameResponseParams();
-    return result;
+  Function _surfaceSubmitFrameResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new SurfaceSubmitFrameResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _surfaceMethodSubmitFrameName,
+          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 _surfaceMethodGetIdNamespaceName:
-        var response = _impl.getIdNamespace(_surfaceGetIdNamespaceResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _surfaceMethodGetIdNamespaceName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _surfaceMethodGetIdNamespaceName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getIdNamespace(_surfaceGetIdNamespaceResponseParamsResponder(message.header.requestId));
         break;
       case _surfaceMethodSetResourceReturnerName:
         var params = _SurfaceSetResourceReturnerParams.deserialize(
             message.payload);
         _impl.setResourceReturner(params.returner);
         break;
       case _surfaceMethodCreateSurfaceName:
         var params = _SurfaceCreateSurfaceParams.deserialize(
             message.payload);
         _impl.createSurface(params.idLocal);
         break;
       case _surfaceMethodSubmitFrameName:
         var params = _SurfaceSubmitFrameParams.deserialize(
             message.payload);
-        var response = _impl.submitFrame(params.idLocal,params.frame,_surfaceSubmitFrameResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _surfaceMethodSubmitFrameName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _surfaceMethodSubmitFrameName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.submitFrame(params.idLocal, params.frame, _surfaceSubmitFrameResponseParamsResponder(message.header.requestId));
         break;
       case _surfaceMethodDestroySurfaceName:
         var params = _SurfaceDestroySurfaceParams.deserialize(
             message.payload);
         _impl.destroySurface(params.idLocal);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Surface get impl => _impl;
   set impl(Surface 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, [Surface impl])
       : super(new _SurfaceStubControl.fromHandle(handle, impl));
 
   static SurfaceStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For SurfaceStub"));
     return new SurfaceStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic getIdNamespace([Function responseFactory = null]) {
-    return impl.getIdNamespace(responseFactory);
+  void getIdNamespace(void callback(int idNamespace)) {
+    return impl.getIdNamespace(callback);
   }
   void setResourceReturner(ResourceReturnerInterface returner) {
     return impl.setResourceReturner(returner);
   }
   void createSurface(int idLocal) {
     return impl.createSurface(idLocal);
   }
-  dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]) {
-    return impl.submitFrame(idLocal,frame,responseFactory);
+  void submitFrame(int idLocal,Frame frame,void callback()) {
+    return impl.submitFrame(idLocal,frame,callback);
   }
   void destroySurface(int idLocal) {
     return impl.destroySurface(idLocal);
   }
 }