| Index: mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart
|
| diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart
|
| index 45885e971b85be34f3d3cf9e5cb6127ebd73a7fb..2bb5cf804d344a9ac0d1a0de1f4604b1454e1eae 100644
|
| --- a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart
|
| +++ b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart
|
| @@ -27,6 +27,13 @@ class Request extends bindings.Struct {
|
|
|
| Request() : super(kVersions.last.size);
|
|
|
| + Request.init(
|
| + int this.x,
|
| + core.MojoMessagePipeEndpoint this.pipe,
|
| + List<core.MojoMessagePipeEndpoint> this.morePipes,
|
| + sample_import_mojom.ImportedInterfaceInterface this.obj
|
| + ) : super(kVersions.last.size);
|
| +
|
| static Request deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -135,6 +142,11 @@ class Response extends bindings.Struct {
|
|
|
| Response() : super(kVersions.last.size);
|
|
|
| + Response.init(
|
| + int this.x,
|
| + core.MojoMessagePipeEndpoint this.pipe
|
| + ) : super(kVersions.last.size);
|
| +
|
| static Response deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -218,6 +230,10 @@ class _NamedObjectSetNameParams extends bindings.Struct {
|
|
|
| _NamedObjectSetNameParams() : super(kVersions.last.size);
|
|
|
| + _NamedObjectSetNameParams.init(
|
| + String this.name
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _NamedObjectSetNameParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -289,6 +305,9 @@ class _NamedObjectGetNameParams extends bindings.Struct {
|
|
|
| _NamedObjectGetNameParams() : super(kVersions.last.size);
|
|
|
| + _NamedObjectGetNameParams.init(
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _NamedObjectGetNameParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -348,6 +367,10 @@ class NamedObjectGetNameResponseParams extends bindings.Struct {
|
|
|
| NamedObjectGetNameResponseParams() : super(kVersions.last.size);
|
|
|
| + NamedObjectGetNameResponseParams.init(
|
| + String this.name
|
| + ) : super(kVersions.last.size);
|
| +
|
| static NamedObjectGetNameResponseParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -421,6 +444,11 @@ class _FactoryDoStuffParams extends bindings.Struct {
|
|
|
| _FactoryDoStuffParams() : super(kVersions.last.size);
|
|
|
| + _FactoryDoStuffParams.init(
|
| + Request this.request,
|
| + core.MojoMessagePipeEndpoint this.pipe
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _FactoryDoStuffParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -506,6 +534,11 @@ class FactoryDoStuffResponseParams extends bindings.Struct {
|
|
|
| FactoryDoStuffResponseParams() : super(kVersions.last.size);
|
|
|
| + FactoryDoStuffResponseParams.init(
|
| + Response this.response,
|
| + String this.text
|
| + ) : super(kVersions.last.size);
|
| +
|
| static FactoryDoStuffResponseParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -590,6 +623,10 @@ class _FactoryDoStuff2Params extends bindings.Struct {
|
|
|
| _FactoryDoStuff2Params() : super(kVersions.last.size);
|
|
|
| + _FactoryDoStuff2Params.init(
|
| + core.MojoDataPipeConsumer this.pipe
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _FactoryDoStuff2Params deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -661,6 +698,10 @@ class FactoryDoStuff2ResponseParams extends bindings.Struct {
|
|
|
| FactoryDoStuff2ResponseParams() : super(kVersions.last.size);
|
|
|
| + FactoryDoStuff2ResponseParams.init(
|
| + String this.text
|
| + ) : super(kVersions.last.size);
|
| +
|
| static FactoryDoStuff2ResponseParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -733,6 +774,10 @@ class _FactoryCreateNamedObjectParams extends bindings.Struct {
|
|
|
| _FactoryCreateNamedObjectParams() : super(kVersions.last.size);
|
|
|
| + _FactoryCreateNamedObjectParams.init(
|
| + NamedObjectInterfaceRequest this.obj
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _FactoryCreateNamedObjectParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -804,6 +849,10 @@ class _FactoryRequestImportedInterfaceParams extends bindings.Struct {
|
|
|
| _FactoryRequestImportedInterfaceParams() : super(kVersions.last.size);
|
|
|
| + _FactoryRequestImportedInterfaceParams.init(
|
| + sample_import_mojom.ImportedInterfaceInterfaceRequest this.obj
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _FactoryRequestImportedInterfaceParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -875,6 +924,10 @@ class FactoryRequestImportedInterfaceResponseParams extends bindings.Struct {
|
|
|
| FactoryRequestImportedInterfaceResponseParams() : super(kVersions.last.size);
|
|
|
| + FactoryRequestImportedInterfaceResponseParams.init(
|
| + sample_import_mojom.ImportedInterfaceInterfaceRequest this.obj
|
| + ) : super(kVersions.last.size);
|
| +
|
| static FactoryRequestImportedInterfaceResponseParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -946,6 +999,10 @@ class _FactoryTakeImportedInterfaceParams extends bindings.Struct {
|
|
|
| _FactoryTakeImportedInterfaceParams() : super(kVersions.last.size);
|
|
|
| + _FactoryTakeImportedInterfaceParams.init(
|
| + sample_import_mojom.ImportedInterfaceInterface this.obj
|
| + ) : super(kVersions.last.size);
|
| +
|
| static _FactoryTakeImportedInterfaceParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -1017,6 +1074,10 @@ class FactoryTakeImportedInterfaceResponseParams extends bindings.Struct {
|
|
|
| FactoryTakeImportedInterfaceResponseParams() : super(kVersions.last.size);
|
|
|
| + FactoryTakeImportedInterfaceResponseParams.init(
|
| + sample_import_mojom.ImportedInterfaceInterface this.obj
|
| + ) : super(kVersions.last.size);
|
| +
|
| static FactoryTakeImportedInterfaceResponseParams deserialize(bindings.Message message) {
|
| var decoder = new bindings.Decoder(message);
|
| var result = decode(decoder);
|
| @@ -1083,17 +1144,19 @@ const int _namedObjectMethodSetNameName = 0;
|
| const int _namedObjectMethodGetNameName = 1;
|
|
|
| class _NamedObjectServiceDescription implements service_describer.ServiceDescription {
|
| - dynamic getTopLevelInterface([Function responseFactory]){
|
| + void getTopLevelInterface(Function responder){
|
| var interfaceTypeKey = getRuntimeTypeInfo().services["sample::NamedObject"];
|
| var userDefinedType = getAllMojomTypeDefinitions()[interfaceTypeKey];
|
| - return responseFactory(userDefinedType.interfaceType);
|
| + responder(userDefinedType.interfaceType);
|
| }
|
|
|
| - dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
|
| - responseFactory(getAllMojomTypeDefinitions()[typeKey]);
|
| + void getTypeDefinition(String typeKey, Function responder) {
|
| + responder(getAllMojomTypeDefinitions()[typeKey]);
|
| + }
|
|
|
| - dynamic getAllTypeDefinitions([Function responseFactory]) =>
|
| - responseFactory(getAllMojomTypeDefinitions());
|
| + void getAllTypeDefinitions(Function responder) {
|
| + responder(getAllMojomTypeDefinitions());
|
| + }
|
| }
|
|
|
| abstract class NamedObject {
|
| @@ -1119,7 +1182,7 @@ abstract class NamedObject {
|
| return p;
|
| }
|
| void setName(String name);
|
| - dynamic getName([Function responseFactory = null]);
|
| + void getName(void callback(String name));
|
| }
|
|
|
| abstract class NamedObjectInterface
|
| @@ -1169,18 +1232,14 @@ class _NamedObjectProxyControl
|
| 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.name );
|
| break;
|
| default:
|
| proxyError("Unexpected message type: ${message.header.type}");
|
| @@ -1239,16 +1298,18 @@ class NamedObjectProxy
|
| ctrl.sendMessage(params,
|
| _namedObjectMethodSetNameName);
|
| }
|
| - dynamic getName([Function responseFactory = null]) {
|
| + void getName(void callback(String name)) {
|
| if (impl != null) {
|
| - return new Future(() => impl.getName(_NamedObjectStubControl._namedObjectGetNameResponseParamsFactory));
|
| + impl.getName(callback);
|
| + return;
|
| }
|
| var params = new _NamedObjectGetNameParams();
|
| - return ctrl.sendMessageWithRequestId(
|
| + ctrl.sendMessageWithRequestId(
|
| params,
|
| _namedObjectMethodGetNameName,
|
| -1,
|
| - bindings.MessageHeader.kMessageExpectsResponse);
|
| + bindings.MessageHeader.kMessageExpectsResponse,
|
| + callback);
|
| }
|
| }
|
|
|
| @@ -1274,17 +1335,24 @@ class _NamedObjectStubControl
|
| String get serviceName => NamedObject.serviceName;
|
|
|
|
|
| - static NamedObjectGetNameResponseParams _namedObjectGetNameResponseParamsFactory(String name) {
|
| - var result = new NamedObjectGetNameResponseParams();
|
| - result.name = name;
|
| - return result;
|
| + Function _namedObjectGetNameResponseParamsResponder(
|
| + int requestId) {
|
| + return (String name) {
|
| + var result = new NamedObjectGetNameResponseParams();
|
| + result.name = name;
|
| + sendResponse(buildResponseWithId(
|
| + result,
|
| + _namedObjectMethodGetNameName,
|
| + 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");
|
| @@ -1296,30 +1364,12 @@ class _NamedObjectStubControl
|
| _impl.setName(params.name);
|
| break;
|
| case _namedObjectMethodGetNameName:
|
| - var response = _impl.getName(_namedObjectGetNameResponseParamsFactory);
|
| - if (response is Future) {
|
| - return response.then((response) {
|
| - if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _namedObjectMethodGetNameName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| - });
|
| - } else if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _namedObjectMethodGetNameName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| + _impl.getName(_namedObjectGetNameResponseParamsResponder(message.header.requestId));
|
| break;
|
| default:
|
| throw new bindings.MojoCodecError("Unexpected message name");
|
| break;
|
| }
|
| - return null;
|
| }
|
|
|
| NamedObject get impl => _impl;
|
| @@ -1376,8 +1426,8 @@ class NamedObjectStub
|
| void setName(String name) {
|
| return impl.setName(name);
|
| }
|
| - dynamic getName([Function responseFactory = null]) {
|
| - return impl.getName(responseFactory);
|
| + void getName(void callback(String name)) {
|
| + return impl.getName(callback);
|
| }
|
| }
|
|
|
| @@ -1388,14 +1438,17 @@ const int _factoryMethodRequestImportedInterfaceName = 3;
|
| const int _factoryMethodTakeImportedInterfaceName = 4;
|
|
|
| class _FactoryServiceDescription 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 Factory {
|
| @@ -1420,11 +1473,11 @@ abstract class Factory {
|
| s.connectToService(url, p, name);
|
| return p;
|
| }
|
| - dynamic doStuff(Request request,core.MojoMessagePipeEndpoint pipe,[Function responseFactory = null]);
|
| - dynamic doStuff2(core.MojoDataPipeConsumer pipe,[Function responseFactory = null]);
|
| + void doStuff(Request request,core.MojoMessagePipeEndpoint pipe,void callback(Response response, String text));
|
| + void doStuff2(core.MojoDataPipeConsumer pipe,void callback(String text));
|
| void createNamedObject(NamedObjectInterfaceRequest obj);
|
| - dynamic requestImportedInterface(sample_import_mojom.ImportedInterfaceInterfaceRequest obj,[Function responseFactory = null]);
|
| - dynamic takeImportedInterface(sample_import_mojom.ImportedInterfaceInterface obj,[Function responseFactory = null]);
|
| + void requestImportedInterface(sample_import_mojom.ImportedInterfaceInterfaceRequest obj,void callback(sample_import_mojom.ImportedInterfaceInterfaceRequest obj));
|
| + void takeImportedInterface(sample_import_mojom.ImportedInterfaceInterface obj,void callback(sample_import_mojom.ImportedInterfaceInterface obj));
|
| }
|
|
|
| abstract class FactoryInterface
|
| @@ -1474,18 +1527,14 @@ class _FactoryProxyControl
|
| 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.response , r.text );
|
| break;
|
| case _factoryMethodDoStuff2Name:
|
| var r = FactoryDoStuff2ResponseParams.deserialize(
|
| @@ -1494,18 +1543,14 @@ class _FactoryProxyControl
|
| 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.text );
|
| break;
|
| case _factoryMethodRequestImportedInterfaceName:
|
| var r = FactoryRequestImportedInterfaceResponseParams.deserialize(
|
| @@ -1514,18 +1559,14 @@ class _FactoryProxyControl
|
| 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.obj );
|
| break;
|
| case _factoryMethodTakeImportedInterfaceName:
|
| var r = FactoryTakeImportedInterfaceResponseParams.deserialize(
|
| @@ -1534,18 +1575,14 @@ class _FactoryProxyControl
|
| 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.obj );
|
| break;
|
| default:
|
| proxyError("Unexpected message type: ${message.header.type}");
|
| @@ -1590,30 +1627,34 @@ class FactoryProxy
|
| }
|
|
|
|
|
| - dynamic doStuff(Request request,core.MojoMessagePipeEndpoint pipe,[Function responseFactory = null]) {
|
| + void doStuff(Request request,core.MojoMessagePipeEndpoint pipe,void callback(Response response, String text)) {
|
| if (impl != null) {
|
| - return new Future(() => impl.doStuff(request,pipe,_FactoryStubControl._factoryDoStuffResponseParamsFactory));
|
| + impl.doStuff(request,pipe,callback);
|
| + return;
|
| }
|
| var params = new _FactoryDoStuffParams();
|
| params.request = request;
|
| params.pipe = pipe;
|
| - return ctrl.sendMessageWithRequestId(
|
| + ctrl.sendMessageWithRequestId(
|
| params,
|
| _factoryMethodDoStuffName,
|
| -1,
|
| - bindings.MessageHeader.kMessageExpectsResponse);
|
| + bindings.MessageHeader.kMessageExpectsResponse,
|
| + callback);
|
| }
|
| - dynamic doStuff2(core.MojoDataPipeConsumer pipe,[Function responseFactory = null]) {
|
| + void doStuff2(core.MojoDataPipeConsumer pipe,void callback(String text)) {
|
| if (impl != null) {
|
| - return new Future(() => impl.doStuff2(pipe,_FactoryStubControl._factoryDoStuff2ResponseParamsFactory));
|
| + impl.doStuff2(pipe,callback);
|
| + return;
|
| }
|
| var params = new _FactoryDoStuff2Params();
|
| params.pipe = pipe;
|
| - return ctrl.sendMessageWithRequestId(
|
| + ctrl.sendMessageWithRequestId(
|
| params,
|
| _factoryMethodDoStuff2Name,
|
| -1,
|
| - bindings.MessageHeader.kMessageExpectsResponse);
|
| + bindings.MessageHeader.kMessageExpectsResponse,
|
| + callback);
|
| }
|
| void createNamedObject(NamedObjectInterfaceRequest obj) {
|
| if (impl != null) {
|
| @@ -1629,29 +1670,33 @@ class FactoryProxy
|
| ctrl.sendMessage(params,
|
| _factoryMethodCreateNamedObjectName);
|
| }
|
| - dynamic requestImportedInterface(sample_import_mojom.ImportedInterfaceInterfaceRequest obj,[Function responseFactory = null]) {
|
| + void requestImportedInterface(sample_import_mojom.ImportedInterfaceInterfaceRequest obj,void callback(sample_import_mojom.ImportedInterfaceInterfaceRequest obj)) {
|
| if (impl != null) {
|
| - return new Future(() => impl.requestImportedInterface(obj,_FactoryStubControl._factoryRequestImportedInterfaceResponseParamsFactory));
|
| + impl.requestImportedInterface(obj,callback);
|
| + return;
|
| }
|
| var params = new _FactoryRequestImportedInterfaceParams();
|
| params.obj = obj;
|
| - return ctrl.sendMessageWithRequestId(
|
| + ctrl.sendMessageWithRequestId(
|
| params,
|
| _factoryMethodRequestImportedInterfaceName,
|
| -1,
|
| - bindings.MessageHeader.kMessageExpectsResponse);
|
| + bindings.MessageHeader.kMessageExpectsResponse,
|
| + callback);
|
| }
|
| - dynamic takeImportedInterface(sample_import_mojom.ImportedInterfaceInterface obj,[Function responseFactory = null]) {
|
| + void takeImportedInterface(sample_import_mojom.ImportedInterfaceInterface obj,void callback(sample_import_mojom.ImportedInterfaceInterface obj)) {
|
| if (impl != null) {
|
| - return new Future(() => impl.takeImportedInterface(obj,_FactoryStubControl._factoryTakeImportedInterfaceResponseParamsFactory));
|
| + impl.takeImportedInterface(obj,callback);
|
| + return;
|
| }
|
| var params = new _FactoryTakeImportedInterfaceParams();
|
| params.obj = obj;
|
| - return ctrl.sendMessageWithRequestId(
|
| + ctrl.sendMessageWithRequestId(
|
| params,
|
| _factoryMethodTakeImportedInterfaceName,
|
| -1,
|
| - bindings.MessageHeader.kMessageExpectsResponse);
|
| + bindings.MessageHeader.kMessageExpectsResponse,
|
| + callback);
|
| }
|
| }
|
|
|
| @@ -1677,33 +1722,61 @@ class _FactoryStubControl
|
| String get serviceName => Factory.serviceName;
|
|
|
|
|
| - static FactoryDoStuffResponseParams _factoryDoStuffResponseParamsFactory(Response response, String text) {
|
| - var result = new FactoryDoStuffResponseParams();
|
| - result.response = response;
|
| - result.text = text;
|
| - return result;
|
| - }
|
| - static FactoryDoStuff2ResponseParams _factoryDoStuff2ResponseParamsFactory(String text) {
|
| - var result = new FactoryDoStuff2ResponseParams();
|
| - result.text = text;
|
| - return result;
|
| - }
|
| - static FactoryRequestImportedInterfaceResponseParams _factoryRequestImportedInterfaceResponseParamsFactory(sample_import_mojom.ImportedInterfaceInterfaceRequest obj) {
|
| - var result = new FactoryRequestImportedInterfaceResponseParams();
|
| - result.obj = obj;
|
| - return result;
|
| - }
|
| - static FactoryTakeImportedInterfaceResponseParams _factoryTakeImportedInterfaceResponseParamsFactory(sample_import_mojom.ImportedInterfaceInterface obj) {
|
| - var result = new FactoryTakeImportedInterfaceResponseParams();
|
| - result.obj = obj;
|
| - return result;
|
| - }
|
| -
|
| - dynamic handleMessage(bindings.ServiceMessage message) {
|
| + Function _factoryDoStuffResponseParamsResponder(
|
| + int requestId) {
|
| + return (Response response, String text) {
|
| + var result = new FactoryDoStuffResponseParams();
|
| + result.response = response;
|
| + result.text = text;
|
| + sendResponse(buildResponseWithId(
|
| + result,
|
| + _factoryMethodDoStuffName,
|
| + requestId,
|
| + bindings.MessageHeader.kMessageIsResponse));
|
| + };
|
| + }
|
| + Function _factoryDoStuff2ResponseParamsResponder(
|
| + int requestId) {
|
| + return (String text) {
|
| + var result = new FactoryDoStuff2ResponseParams();
|
| + result.text = text;
|
| + sendResponse(buildResponseWithId(
|
| + result,
|
| + _factoryMethodDoStuff2Name,
|
| + requestId,
|
| + bindings.MessageHeader.kMessageIsResponse));
|
| + };
|
| + }
|
| + Function _factoryRequestImportedInterfaceResponseParamsResponder(
|
| + int requestId) {
|
| + return (sample_import_mojom.ImportedInterfaceInterfaceRequest obj) {
|
| + var result = new FactoryRequestImportedInterfaceResponseParams();
|
| + result.obj = obj;
|
| + sendResponse(buildResponseWithId(
|
| + result,
|
| + _factoryMethodRequestImportedInterfaceName,
|
| + requestId,
|
| + bindings.MessageHeader.kMessageIsResponse));
|
| + };
|
| + }
|
| + Function _factoryTakeImportedInterfaceResponseParamsResponder(
|
| + int requestId) {
|
| + return (sample_import_mojom.ImportedInterfaceInterface obj) {
|
| + var result = new FactoryTakeImportedInterfaceResponseParams();
|
| + result.obj = obj;
|
| + sendResponse(buildResponseWithId(
|
| + result,
|
| + _factoryMethodTakeImportedInterfaceName,
|
| + requestId,
|
| + bindings.MessageHeader.kMessageIsResponse));
|
| + };
|
| + }
|
| +
|
| + 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");
|
| @@ -1712,46 +1785,12 @@ class _FactoryStubControl
|
| case _factoryMethodDoStuffName:
|
| var params = _FactoryDoStuffParams.deserialize(
|
| message.payload);
|
| - var response = _impl.doStuff(params.request,params.pipe,_factoryDoStuffResponseParamsFactory);
|
| - if (response is Future) {
|
| - return response.then((response) {
|
| - if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodDoStuffName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| - });
|
| - } else if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodDoStuffName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| + _impl.doStuff(params.request, params.pipe, _factoryDoStuffResponseParamsResponder(message.header.requestId));
|
| break;
|
| case _factoryMethodDoStuff2Name:
|
| var params = _FactoryDoStuff2Params.deserialize(
|
| message.payload);
|
| - var response = _impl.doStuff2(params.pipe,_factoryDoStuff2ResponseParamsFactory);
|
| - if (response is Future) {
|
| - return response.then((response) {
|
| - if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodDoStuff2Name,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| - });
|
| - } else if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodDoStuff2Name,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| + _impl.doStuff2(params.pipe, _factoryDoStuff2ResponseParamsResponder(message.header.requestId));
|
| break;
|
| case _factoryMethodCreateNamedObjectName:
|
| var params = _FactoryCreateNamedObjectParams.deserialize(
|
| @@ -1761,52 +1800,17 @@ class _FactoryStubControl
|
| case _factoryMethodRequestImportedInterfaceName:
|
| var params = _FactoryRequestImportedInterfaceParams.deserialize(
|
| message.payload);
|
| - var response = _impl.requestImportedInterface(params.obj,_factoryRequestImportedInterfaceResponseParamsFactory);
|
| - if (response is Future) {
|
| - return response.then((response) {
|
| - if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodRequestImportedInterfaceName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| - });
|
| - } else if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodRequestImportedInterfaceName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| + _impl.requestImportedInterface(params.obj, _factoryRequestImportedInterfaceResponseParamsResponder(message.header.requestId));
|
| break;
|
| case _factoryMethodTakeImportedInterfaceName:
|
| var params = _FactoryTakeImportedInterfaceParams.deserialize(
|
| message.payload);
|
| - var response = _impl.takeImportedInterface(params.obj,_factoryTakeImportedInterfaceResponseParamsFactory);
|
| - if (response is Future) {
|
| - return response.then((response) {
|
| - if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodTakeImportedInterfaceName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| - });
|
| - } else if (response != null) {
|
| - return buildResponseWithId(
|
| - response,
|
| - _factoryMethodTakeImportedInterfaceName,
|
| - message.header.requestId,
|
| - bindings.MessageHeader.kMessageIsResponse);
|
| - }
|
| + _impl.takeImportedInterface(params.obj, _factoryTakeImportedInterfaceResponseParamsResponder(message.header.requestId));
|
| break;
|
| default:
|
| throw new bindings.MojoCodecError("Unexpected message name");
|
| break;
|
| }
|
| - return null;
|
| }
|
|
|
| Factory get impl => _impl;
|
| @@ -1860,20 +1864,20 @@ class FactoryStub
|
| }
|
|
|
|
|
| - dynamic doStuff(Request request,core.MojoMessagePipeEndpoint pipe,[Function responseFactory = null]) {
|
| - return impl.doStuff(request,pipe,responseFactory);
|
| + void doStuff(Request request,core.MojoMessagePipeEndpoint pipe,void callback(Response response, String text)) {
|
| + return impl.doStuff(request,pipe,callback);
|
| }
|
| - dynamic doStuff2(core.MojoDataPipeConsumer pipe,[Function responseFactory = null]) {
|
| - return impl.doStuff2(pipe,responseFactory);
|
| + void doStuff2(core.MojoDataPipeConsumer pipe,void callback(String text)) {
|
| + return impl.doStuff2(pipe,callback);
|
| }
|
| void createNamedObject(NamedObjectInterfaceRequest obj) {
|
| return impl.createNamedObject(obj);
|
| }
|
| - dynamic requestImportedInterface(sample_import_mojom.ImportedInterfaceInterfaceRequest obj,[Function responseFactory = null]) {
|
| - return impl.requestImportedInterface(obj,responseFactory);
|
| + void requestImportedInterface(sample_import_mojom.ImportedInterfaceInterfaceRequest obj,void callback(sample_import_mojom.ImportedInterfaceInterfaceRequest obj)) {
|
| + return impl.requestImportedInterface(obj,callback);
|
| }
|
| - dynamic takeImportedInterface(sample_import_mojom.ImportedInterfaceInterface obj,[Function responseFactory = null]) {
|
| - return impl.takeImportedInterface(obj,responseFactory);
|
| + void takeImportedInterface(sample_import_mojom.ImportedInterfaceInterface obj,void callback(sample_import_mojom.ImportedInterfaceInterface obj)) {
|
| + return impl.takeImportedInterface(obj,callback);
|
| }
|
| }
|
|
|
| @@ -1890,7 +1894,7 @@ mojom_types.RuntimeTypeInfo _initRuntimeTypeInfo() {
|
| // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
|
| // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
|
| // file. The string contains the base64 encoding of the gzip-compressed bytes.
|
| - var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xaT3PbRBTXH4eaf6nTDI0oberQNrgwRKYcyOTUGShNhhnIEA7kQkZ21omDbQlJZgwnjjlyzEfgI+Rj8DFy5MgNVtFbe73alSxHltYZ78zOWooU7fu93/uzu89QwlaB8RxG9v42da3iXobrD3Bfxd2zuk4H7ex8a3XR8XeNM9T0uc8/gXd+ONx/dfTNq8Od8MUt9j32+5cw1nAv4V5l5vUjjA6Mj3Ff43zna6vp2+5vE89D9H++R7/0kedfz8Pg/t1z7J6HdmG+gRw6g2NwfVEdx7X28fi1Ux/JrVByk/Yvc/2Sua4zOP0HjX2OtLu438Gd4HQf/14e6ncIX0Q/G7i/hXsL959wN/uea3bsptUxT2z7pIPMU7uLzN9dy+zaZ7bpuc3wh9NvdNpNs93zkduymsgzG+3ecbt34pk+Btgzwy8ftcIvbwUvdaPfJ/g8xH0Jfgf4aYBzicJjiXr+HIhZXQ7Hv1fC8dTg434F40VpMtwVCnf6/4lw/8o+8PutVkS+D0GWvPCtMn6AyD3QJ5c3aHWBvGsgM8j7qQv2xMpNWp680qjvn6rj8tL2u8SxP1HLih8inAJ+3CuAHwozD4OZL/GTSX6Uh28pBt/yFPiqMfi+A99z2g7ixZ8A389yxLdC+TCVE0cNau4adT1ruzVgLiO7DePcwm75rQI6E+H0BPInWeyWzJfkL0n5zUtBfpi33fpo4PPsNsD3aQF2qwjyZZHdivKMuj7yA1ngRfQL9vuCxeupJHlGRZuJv3pBEo2i/RXLi7TxL2s/lRT/Al5sFmRHWoIdqdQ8WT79Q65T8mlbgNP7uK+M8yl0hIJ1s4y8Ugvglcg/B7z6QlL/rHLWl1XBultLgZdG6UPEry9dZPmI3Y2I4vesYH9NcHBS2pdo/2EDMIjIP1whzo+d5Zlnvg37HHbjTMiTjQJ4ojHzIPdXYc4swyfdl7up3V5CXqWnwF+PsVuSJ8N6dq/r2K6PjvcIbKw+NiWx2/OM7LYGGIjkn6e8Sya73cw5Porstk7tgzzAvQ0K3opoOnzuE7DloR0nvDBtfkcWRn+m5PGuQB/PwU/G8Hju8j2Z+PxRzusI2fmcFJ9KKfRSiolPj3B/L5i/9TPizZh3nnKb4tMzwIArP5VbLuw5nT0H730uwf6lrPEpax4HvnM9hsckOC14nI7Hz8FHLHjMj0sDkmepfL0QvV7A+BfD58uY/Wh6PlVOXnWHs248QO6v7eb1BsFEdSii9eYDODcVLDMjPHmYc51DklxGzDmORumVPR/b1+PPHWZ1fn2A/GudsfN+dMvOHUh9A8grTX2DrPvDPTBkHi9W5nB/mPCprGV7fkfs6LXAjtYlsaMrJVs7ei2ZHZUn4IcSE9dmdc45wkmOuox58zfrwDnZ/Y1onWG8EY9T2jpQUp/F1IGS2xH83oX38sKPrQeukbofsKs/dDHvFGVUKzpr3r0J+hsI9g2XQed54Za23qCUc73dXbhXVL0dDx+NDuQZ1DVpnPuk3YN1Rtd20VEAksfnTTA+LiDeqyAD4U2ZE2fUKdb9lSlw1G+w7l8Fn18EfrKs+2n/KYor23o2cYWtLyT5HVNWGNHT/ZzjCrteNtT5iCNrizgS2Q8pMo4k1X+S5/8PAAD//wmWKGaINQAA";
|
| + var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xaT3PbRBTXH4eaf6nTDI0oberQNrgwRCYcyOTUGShthxnoEA705JGdteNgW0KSGcOJY44c8xH4CPkYfIweOXKjK+utvV7tSpYrS+uOd2ZnLUWK9v3e7/3Z3WcoYavAeAEje/+IulZxL8P1R7hv4+5ZfaeHjo+/t/ro9IfmOWr53OfvwTs/vXj+uPHd4xfH4YsH7Hvs969grOFewr3KzOtnGB0Y7+K+w/nOt1bLt93f556H6P/8iH4dIs8fz8Pg/t1z7IGHnsJ8Azl0Bsfg+rI6i2vt09lrpz6VW6HkJu0/5voRc11ncPofGvscaddxv4Y7wekm/r050e8Evoh+9nB/B/cO7g3czaHnmj27ZfXMjm13esg8s/vI/MO1zL59bh+antsa/zKdYbPXbZndgY/cttVCntnsDk67g45n+hhhzww/3WiHnz4IXupHvk/wuY37BvwO8NMA5xKFxwb1/AUQs7oZjv9sheOZwcf9JYyXpflwVyjc6f8nwv0b+8QfttsR+T4GWfLCt8r4ASL3SJ9f3qDVBfLugMwg7+cu2BMrN2l58kqjvn+mzspL2+8Gx/5ELSt+iHAK+HGjAH4ozDwMZr7ETyb5UR6+pRh8ywvgq8bg+x58z+k6iBd/Any/yBHfCuXDVE4cNai5a9T1su3WgLlM7TaMc2u75bcK6EyE0z3In2SxWzJfkr8k5TePBPlh3nbro5HPs9sA3/sF2K0iyJdFdivKM+r61A9kgRfRL9jvIYvXfUnyjIq2FH91SBKNov0Vy4u08S9rP5UU/wJe7BdkR1qCHanUPFk+/UuuU/LpSIDTh7hvzfIpdISCdbOMvFIL4JXIPwe8+kpS/6xy1pdVwbpbS4GXRulDxK+vXWT5iN2NiOL3oGB/TXBwUtqXaP9hDzCIyD9ZIa6OneWZZ74L+xx281zIk70CeKIx8yD3t2HOLMPn3Zd7Xbu9grxKT4G/HmO3JE+G9eyzvmO7Pjp9RlBj9bEvid1eZGS3NcBAJP8q5V0y2e1+zvFRZLd1ah/kFu5dUPBBRNPhc5+BLU/sOOGFRfM7sjD6KyWPnwr08RD8ZAyPVy7fk4nPn+S8jpCdz0nxqZRCL6WY+HQH9w+C+Vu/IN6Meecpb1J8egAYcOWncsu1Paez5+C9LyXYv5Q1PmXN48B37sbwmASnNY/T8fgh+Ig1j/lxaUTyLJWvF6LXSxj/Zvh8FbMfTc+nysmrrnHWjSfI/a3bGm8QzFWHIlpv3oJzU8EyM8KT2znXOSTJZcSc42iUXtnzsed6/LnDss6vT5A/1hk77ztv2LkDqW8AeaWpb5B1f3gAhszjxdYK7g8TPpW1bM/viB09EdjRriR29FLJ1o6eSGZH5Tn4ocTEtWWdc05xkqMuY9X8zS5wTnZ/I1pnGG/F45S2DpTUZzF1oOR2BL/34b288GPrgWuk7gfs6k9dzDtFmdaKLpt3b4P+RoJ9w03QeV64pa03KOVcb3cd7hVVb8fDR6MDeQZ1TRrnPmk3YJ3Rt13UCEDy+LwJxrsFxHsVZCC8KXPijLrAur+yAI76a6z7t8HnF4GfLOt+2n+K4sqRnk1cYesLSX7HlBVG9HQz57jCrpcNdTXiyM46jkT2Q4qMI0n1n+T5VwEAAP//hkGPYIg1AAA=";
|
|
|
| // Deserialize RuntimeTypeInfo
|
| var bytes = BASE64.decode(serializedRuntimeTypeInfo);
|
|
|
Chromium Code Reviews
Issue 2006093002:
Dart: Futures -> Callbacks. (Closed)
Base URL: git@github.com:domokit/mojo.git@master