Index: mojo/dart/packages/mojo/lib/mojo/bindings/types/service_describer.mojom.dart |
diff --git a/mojo/dart/packages/mojo/lib/mojo/bindings/types/service_describer.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/bindings/types/service_describer.mojom.dart |
index b323c42b507ed46007445bdf06bf7fe2b4727532..ffe2fda257fddd3ddee000dff939477778b6d646 100644 |
--- a/mojo/dart/packages/mojo/lib/mojo/bindings/types/service_describer.mojom.dart |
+++ b/mojo/dart/packages/mojo/lib/mojo/bindings/types/service_describer.mojom.dart |
@@ -19,6 +19,11 @@ class _ServiceDescriberDescribeServiceParams extends bindings.Struct { |
_ServiceDescriberDescribeServiceParams() : super(kVersions.last.size); |
+ _ServiceDescriberDescribeServiceParams.init( |
+ String this.interfaceName, |
+ ServiceDescriptionInterfaceRequest this.descriptionRequest |
+ ) : super(kVersions.last.size); |
+ |
static _ServiceDescriberDescribeServiceParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -101,6 +106,9 @@ class _ServiceDescriptionGetTopLevelInterfaceParams extends bindings.Struct { |
_ServiceDescriptionGetTopLevelInterfaceParams() : super(kVersions.last.size); |
+ _ServiceDescriptionGetTopLevelInterfaceParams.init( |
+ ) : super(kVersions.last.size); |
+ |
static _ServiceDescriptionGetTopLevelInterfaceParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -160,6 +168,10 @@ class ServiceDescriptionGetTopLevelInterfaceResponseParams extends bindings.Stru |
ServiceDescriptionGetTopLevelInterfaceResponseParams() : super(kVersions.last.size); |
+ ServiceDescriptionGetTopLevelInterfaceResponseParams.init( |
+ mojom_types_mojom.MojomInterface this.mojomInterface |
+ ) : super(kVersions.last.size); |
+ |
static ServiceDescriptionGetTopLevelInterfaceResponseParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -233,6 +245,10 @@ class _ServiceDescriptionGetTypeDefinitionParams extends bindings.Struct { |
_ServiceDescriptionGetTypeDefinitionParams() : super(kVersions.last.size); |
+ _ServiceDescriptionGetTypeDefinitionParams.init( |
+ String this.typeKey |
+ ) : super(kVersions.last.size); |
+ |
static _ServiceDescriptionGetTypeDefinitionParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -305,6 +321,10 @@ class ServiceDescriptionGetTypeDefinitionResponseParams extends bindings.Struct |
ServiceDescriptionGetTypeDefinitionResponseParams() : super(kVersions.last.size); |
+ ServiceDescriptionGetTypeDefinitionResponseParams.init( |
+ mojom_types_mojom.UserDefinedType this.type |
+ ) : super(kVersions.last.size); |
+ |
static ServiceDescriptionGetTypeDefinitionResponseParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -376,6 +396,9 @@ class _ServiceDescriptionGetAllTypeDefinitionsParams extends bindings.Struct { |
_ServiceDescriptionGetAllTypeDefinitionsParams() : super(kVersions.last.size); |
+ _ServiceDescriptionGetAllTypeDefinitionsParams.init( |
+ ) : super(kVersions.last.size); |
+ |
static _ServiceDescriptionGetAllTypeDefinitionsParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -435,6 +458,10 @@ class ServiceDescriptionGetAllTypeDefinitionsResponseParams extends bindings.Str |
ServiceDescriptionGetAllTypeDefinitionsResponseParams() : super(kVersions.last.size); |
+ ServiceDescriptionGetAllTypeDefinitionsResponseParams.init( |
+ Map<String, mojom_types_mojom.UserDefinedType> this.definitions |
+ ) : super(kVersions.last.size); |
+ |
static ServiceDescriptionGetAllTypeDefinitionsResponseParams deserialize(bindings.Message message) { |
var decoder = new bindings.Decoder(message); |
var result = decode(decoder); |
@@ -558,14 +585,17 @@ class ServiceDescriptionGetAllTypeDefinitionsResponseParams extends bindings.Str |
const int _serviceDescriberMethodDescribeServiceName = 0; |
class _ServiceDescriberServiceDescription implements 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 ServiceDescriber { |
@@ -716,11 +746,11 @@ class _ServiceDescriberStubControl |
- 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"); |
@@ -735,7 +765,6 @@ class _ServiceDescriberStubControl |
throw new bindings.MojoCodecError("Unexpected message name"); |
break; |
} |
- return null; |
} |
ServiceDescriber get impl => _impl; |
@@ -799,14 +828,17 @@ const int _serviceDescriptionMethodGetTypeDefinitionName = 1; |
const int _serviceDescriptionMethodGetAllTypeDefinitionsName = 2; |
class _ServiceDescriptionServiceDescription implements 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 ServiceDescription { |
@@ -831,9 +863,9 @@ abstract class ServiceDescription { |
s.connectToService(url, p, name); |
return p; |
} |
- dynamic getTopLevelInterface([Function responseFactory = null]); |
- dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]); |
- dynamic getAllTypeDefinitions([Function responseFactory = null]); |
+ void getTopLevelInterface(void callback(mojom_types_mojom.MojomInterface mojomInterface)); |
+ void getTypeDefinition(String typeKey,void callback(mojom_types_mojom.UserDefinedType type)); |
+ void getAllTypeDefinitions(void callback(Map<String, mojom_types_mojom.UserDefinedType> definitions)); |
} |
abstract class ServiceDescriptionInterface |
@@ -883,18 +915,14 @@ class _ServiceDescriptionProxyControl |
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.mojomInterface ); |
break; |
case _serviceDescriptionMethodGetTypeDefinitionName: |
var r = ServiceDescriptionGetTypeDefinitionResponseParams.deserialize( |
@@ -903,18 +931,14 @@ class _ServiceDescriptionProxyControl |
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.type ); |
break; |
case _serviceDescriptionMethodGetAllTypeDefinitionsName: |
var r = ServiceDescriptionGetAllTypeDefinitionsResponseParams.deserialize( |
@@ -923,18 +947,14 @@ class _ServiceDescriptionProxyControl |
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.definitions ); |
break; |
default: |
proxyError("Unexpected message type: ${message.header.type}"); |
@@ -979,39 +999,45 @@ class ServiceDescriptionProxy |
} |
- dynamic getTopLevelInterface([Function responseFactory = null]) { |
+ void getTopLevelInterface(void callback(mojom_types_mojom.MojomInterface mojomInterface)) { |
if (impl != null) { |
- return new Future(() => impl.getTopLevelInterface(_ServiceDescriptionStubControl._serviceDescriptionGetTopLevelInterfaceResponseParamsFactory)); |
+ impl.getTopLevelInterface(callback); |
+ return; |
} |
var params = new _ServiceDescriptionGetTopLevelInterfaceParams(); |
- return ctrl.sendMessageWithRequestId( |
+ ctrl.sendMessageWithRequestId( |
params, |
_serviceDescriptionMethodGetTopLevelInterfaceName, |
-1, |
- bindings.MessageHeader.kMessageExpectsResponse); |
+ bindings.MessageHeader.kMessageExpectsResponse, |
+ callback); |
} |
- dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) { |
+ void getTypeDefinition(String typeKey,void callback(mojom_types_mojom.UserDefinedType type)) { |
if (impl != null) { |
- return new Future(() => impl.getTypeDefinition(typeKey,_ServiceDescriptionStubControl._serviceDescriptionGetTypeDefinitionResponseParamsFactory)); |
+ impl.getTypeDefinition(typeKey,callback); |
+ return; |
} |
var params = new _ServiceDescriptionGetTypeDefinitionParams(); |
params.typeKey = typeKey; |
- return ctrl.sendMessageWithRequestId( |
+ ctrl.sendMessageWithRequestId( |
params, |
_serviceDescriptionMethodGetTypeDefinitionName, |
-1, |
- bindings.MessageHeader.kMessageExpectsResponse); |
+ bindings.MessageHeader.kMessageExpectsResponse, |
+ callback); |
} |
- dynamic getAllTypeDefinitions([Function responseFactory = null]) { |
+ void getAllTypeDefinitions(void callback(Map<String, mojom_types_mojom.UserDefinedType> definitions)) { |
if (impl != null) { |
- return new Future(() => impl.getAllTypeDefinitions(_ServiceDescriptionStubControl._serviceDescriptionGetAllTypeDefinitionsResponseParamsFactory)); |
+ impl.getAllTypeDefinitions(callback); |
+ return; |
} |
var params = new _ServiceDescriptionGetAllTypeDefinitionsParams(); |
- return ctrl.sendMessageWithRequestId( |
+ ctrl.sendMessageWithRequestId( |
params, |
_serviceDescriptionMethodGetAllTypeDefinitionsName, |
-1, |
- bindings.MessageHeader.kMessageExpectsResponse); |
+ bindings.MessageHeader.kMessageExpectsResponse, |
+ callback); |
} |
} |
@@ -1037,99 +1063,68 @@ class _ServiceDescriptionStubControl |
String get serviceName => ServiceDescription.serviceName; |
- static ServiceDescriptionGetTopLevelInterfaceResponseParams _serviceDescriptionGetTopLevelInterfaceResponseParamsFactory(mojom_types_mojom.MojomInterface mojomInterface) { |
- var result = new ServiceDescriptionGetTopLevelInterfaceResponseParams(); |
- result.mojomInterface = mojomInterface; |
- return result; |
- } |
- static ServiceDescriptionGetTypeDefinitionResponseParams _serviceDescriptionGetTypeDefinitionResponseParamsFactory(mojom_types_mojom.UserDefinedType type) { |
- var result = new ServiceDescriptionGetTypeDefinitionResponseParams(); |
- result.type = type; |
- return result; |
- } |
- static ServiceDescriptionGetAllTypeDefinitionsResponseParams _serviceDescriptionGetAllTypeDefinitionsResponseParamsFactory(Map<String, mojom_types_mojom.UserDefinedType> definitions) { |
- var result = new ServiceDescriptionGetAllTypeDefinitionsResponseParams(); |
- result.definitions = definitions; |
- return result; |
- } |
- |
- dynamic handleMessage(bindings.ServiceMessage message) { |
+ Function _serviceDescriptionGetTopLevelInterfaceResponseParamsResponder( |
+ int requestId) { |
+ return (mojom_types_mojom.MojomInterface mojomInterface) { |
+ var result = new ServiceDescriptionGetTopLevelInterfaceResponseParams(); |
+ result.mojomInterface = mojomInterface; |
+ sendResponse(buildResponseWithId( |
+ result, |
+ _serviceDescriptionMethodGetTopLevelInterfaceName, |
+ requestId, |
+ bindings.MessageHeader.kMessageIsResponse)); |
+ }; |
+ } |
+ Function _serviceDescriptionGetTypeDefinitionResponseParamsResponder( |
+ int requestId) { |
+ return (mojom_types_mojom.UserDefinedType type) { |
+ var result = new ServiceDescriptionGetTypeDefinitionResponseParams(); |
+ result.type = type; |
+ sendResponse(buildResponseWithId( |
+ result, |
+ _serviceDescriptionMethodGetTypeDefinitionName, |
+ requestId, |
+ bindings.MessageHeader.kMessageIsResponse)); |
+ }; |
+ } |
+ Function _serviceDescriptionGetAllTypeDefinitionsResponseParamsResponder( |
+ int requestId) { |
+ return (Map<String, mojom_types_mojom.UserDefinedType> definitions) { |
+ var result = new ServiceDescriptionGetAllTypeDefinitionsResponseParams(); |
+ result.definitions = definitions; |
+ sendResponse(buildResponseWithId( |
+ result, |
+ _serviceDescriptionMethodGetAllTypeDefinitionsName, |
+ 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"); |
} |
switch (message.header.type) { |
case _serviceDescriptionMethodGetTopLevelInterfaceName: |
- var response = _impl.getTopLevelInterface(_serviceDescriptionGetTopLevelInterfaceResponseParamsFactory); |
- if (response is Future) { |
- return response.then((response) { |
- if (response != null) { |
- return buildResponseWithId( |
- response, |
- _serviceDescriptionMethodGetTopLevelInterfaceName, |
- message.header.requestId, |
- bindings.MessageHeader.kMessageIsResponse); |
- } |
- }); |
- } else if (response != null) { |
- return buildResponseWithId( |
- response, |
- _serviceDescriptionMethodGetTopLevelInterfaceName, |
- message.header.requestId, |
- bindings.MessageHeader.kMessageIsResponse); |
- } |
+ _impl.getTopLevelInterface(_serviceDescriptionGetTopLevelInterfaceResponseParamsResponder(message.header.requestId)); |
break; |
case _serviceDescriptionMethodGetTypeDefinitionName: |
var params = _ServiceDescriptionGetTypeDefinitionParams.deserialize( |
message.payload); |
- var response = _impl.getTypeDefinition(params.typeKey,_serviceDescriptionGetTypeDefinitionResponseParamsFactory); |
- if (response is Future) { |
- return response.then((response) { |
- if (response != null) { |
- return buildResponseWithId( |
- response, |
- _serviceDescriptionMethodGetTypeDefinitionName, |
- message.header.requestId, |
- bindings.MessageHeader.kMessageIsResponse); |
- } |
- }); |
- } else if (response != null) { |
- return buildResponseWithId( |
- response, |
- _serviceDescriptionMethodGetTypeDefinitionName, |
- message.header.requestId, |
- bindings.MessageHeader.kMessageIsResponse); |
- } |
+ _impl.getTypeDefinition(params.typeKey, _serviceDescriptionGetTypeDefinitionResponseParamsResponder(message.header.requestId)); |
break; |
case _serviceDescriptionMethodGetAllTypeDefinitionsName: |
- var response = _impl.getAllTypeDefinitions(_serviceDescriptionGetAllTypeDefinitionsResponseParamsFactory); |
- if (response is Future) { |
- return response.then((response) { |
- if (response != null) { |
- return buildResponseWithId( |
- response, |
- _serviceDescriptionMethodGetAllTypeDefinitionsName, |
- message.header.requestId, |
- bindings.MessageHeader.kMessageIsResponse); |
- } |
- }); |
- } else if (response != null) { |
- return buildResponseWithId( |
- response, |
- _serviceDescriptionMethodGetAllTypeDefinitionsName, |
- message.header.requestId, |
- bindings.MessageHeader.kMessageIsResponse); |
- } |
+ _impl.getAllTypeDefinitions(_serviceDescriptionGetAllTypeDefinitionsResponseParamsResponder(message.header.requestId)); |
break; |
default: |
throw new bindings.MojoCodecError("Unexpected message name"); |
break; |
} |
- return null; |
} |
ServiceDescription get impl => _impl; |
@@ -1183,14 +1178,14 @@ class ServiceDescriptionStub |
} |
- dynamic getTopLevelInterface([Function responseFactory = null]) { |
- return impl.getTopLevelInterface(responseFactory); |
+ void getTopLevelInterface(void callback(mojom_types_mojom.MojomInterface mojomInterface)) { |
+ return impl.getTopLevelInterface(callback); |
} |
- dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) { |
- return impl.getTypeDefinition(typeKey,responseFactory); |
+ void getTypeDefinition(String typeKey,void callback(mojom_types_mojom.UserDefinedType type)) { |
+ return impl.getTypeDefinition(typeKey,callback); |
} |
- dynamic getAllTypeDefinitions([Function responseFactory = null]) { |
- return impl.getAllTypeDefinitions(responseFactory); |
+ void getAllTypeDefinitions(void callback(Map<String, mojom_types_mojom.UserDefinedType> definitions)) { |
+ return impl.getAllTypeDefinitions(callback); |
} |
} |