Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1294)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/dart/packages/mojo_services/lib/mojo/url_response_disk_cache.mojom.dart

Issue 2006093002: Dart: Futures -> Callbacks. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Move code from mojo_patch to proxy.dart Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« examples/dart/echo_client/lib/main.dart ('K') | « mojo/dart/packages/mojo_services/lib/mojo/url_loader_interceptor.mojom.dart ('k') | mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/dart/packages/mojo_services/lib/mojo/url_response_disk_cache.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/url_response_disk_cache.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/url_response_disk_cache.mojom.dart
index 6a3dbcb908c83b1e75ba03a96363f0dfc0c64984..6c5c7c61859f25b4b9dd694a241eedcfcc829a3b 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/url_response_disk_cache.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/url_response_disk_cache.mojom.dart
@@ -19,6 +19,10 @@ class _UrlResponseDiskCacheGetParams extends bindings.Struct {
_UrlResponseDiskCacheGetParams() : super(kVersions.last.size);
+ _UrlResponseDiskCacheGetParams.init(
+ String this.url
+ ) : super(kVersions.last.size);
+
static _UrlResponseDiskCacheGetParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -93,6 +97,12 @@ class UrlResponseDiskCacheGetResponseParams extends bindings.Struct {
UrlResponseDiskCacheGetResponseParams() : super(kVersions.last.size);
+ UrlResponseDiskCacheGetResponseParams.init(
+ url_response_mojom.UrlResponse this.response,
+ List<int> this.filePath,
+ List<int> this.cacheDirPath
+ ) : super(kVersions.last.size);
+
static UrlResponseDiskCacheGetResponseParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -189,6 +199,10 @@ class _UrlResponseDiskCacheValidateParams extends bindings.Struct {
_UrlResponseDiskCacheValidateParams() : super(kVersions.last.size);
+ _UrlResponseDiskCacheValidateParams.init(
+ String this.url
+ ) : super(kVersions.last.size);
+
static _UrlResponseDiskCacheValidateParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -261,6 +275,10 @@ class _UrlResponseDiskCacheUpdateParams extends bindings.Struct {
_UrlResponseDiskCacheUpdateParams() : super(kVersions.last.size);
+ _UrlResponseDiskCacheUpdateParams.init(
+ url_response_mojom.UrlResponse this.response
+ ) : super(kVersions.last.size);
+
static _UrlResponseDiskCacheUpdateParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -333,6 +351,10 @@ class _UrlResponseDiskCacheUpdateAndGetParams extends bindings.Struct {
_UrlResponseDiskCacheUpdateAndGetParams() : super(kVersions.last.size);
+ _UrlResponseDiskCacheUpdateAndGetParams.init(
+ url_response_mojom.UrlResponse this.response
+ ) : super(kVersions.last.size);
+
static _UrlResponseDiskCacheUpdateAndGetParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -406,6 +428,11 @@ class UrlResponseDiskCacheUpdateAndGetResponseParams extends bindings.Struct {
UrlResponseDiskCacheUpdateAndGetResponseParams() : super(kVersions.last.size);
+ UrlResponseDiskCacheUpdateAndGetResponseParams.init(
+ List<int> this.filePath,
+ List<int> this.cacheDirPath
+ ) : super(kVersions.last.size);
+
static UrlResponseDiskCacheUpdateAndGetResponseParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -491,6 +518,10 @@ class _UrlResponseDiskCacheUpdateAndGetExtractedParams extends bindings.Struct {
_UrlResponseDiskCacheUpdateAndGetExtractedParams() : super(kVersions.last.size);
+ _UrlResponseDiskCacheUpdateAndGetExtractedParams.init(
+ url_response_mojom.UrlResponse this.response
+ ) : super(kVersions.last.size);
+
static _UrlResponseDiskCacheUpdateAndGetExtractedParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -564,6 +595,11 @@ class UrlResponseDiskCacheUpdateAndGetExtractedResponseParams extends bindings.S
UrlResponseDiskCacheUpdateAndGetExtractedResponseParams() : super(kVersions.last.size);
+ UrlResponseDiskCacheUpdateAndGetExtractedResponseParams.init(
+ List<int> this.extractedDirPath,
+ List<int> this.cacheDirPath
+ ) : super(kVersions.last.size);
+
static UrlResponseDiskCacheUpdateAndGetExtractedResponseParams deserialize(bindings.Message message) {
var decoder = new bindings.Decoder(message);
var result = decode(decoder);
@@ -647,14 +683,17 @@ const int _urlResponseDiskCacheMethodUpdateAndGetName = 3;
const int _urlResponseDiskCacheMethodUpdateAndGetExtractedName = 4;
class _UrlResponseDiskCacheServiceDescription 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 UrlResponseDiskCache {
@@ -679,11 +718,11 @@ abstract class UrlResponseDiskCache {
s.connectToService(url, p, name);
return p;
}
- dynamic get(String url,[Function responseFactory = null]);
+ void get(String url,void callback(url_response_mojom.UrlResponse response, List<int> filePath, List<int> cacheDirPath));
void validate(String url);
void update(url_response_mojom.UrlResponse response);
- dynamic updateAndGet(url_response_mojom.UrlResponse response,[Function responseFactory = null]);
- dynamic updateAndGetExtracted(url_response_mojom.UrlResponse response,[Function responseFactory = null]);
+ void updateAndGet(url_response_mojom.UrlResponse response,void callback(List<int> filePath, List<int> cacheDirPath));
+ void updateAndGetExtracted(url_response_mojom.UrlResponse response,void callback(List<int> extractedDirPath, List<int> cacheDirPath));
}
abstract class UrlResponseDiskCacheInterface
@@ -726,18 +765,14 @@ class _UrlResponseDiskCacheProxyControl
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.filePath , r.cacheDirPath );
break;
case _urlResponseDiskCacheMethodUpdateAndGetName:
var r = UrlResponseDiskCacheUpdateAndGetResponseParams.deserialize(
@@ -746,18 +781,14 @@ class _UrlResponseDiskCacheProxyControl
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.filePath , r.cacheDirPath );
break;
case _urlResponseDiskCacheMethodUpdateAndGetExtractedName:
var r = UrlResponseDiskCacheUpdateAndGetExtractedResponseParams.deserialize(
@@ -766,18 +797,14 @@ class _UrlResponseDiskCacheProxyControl
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.extractedDirPath , r.cacheDirPath );
break;
default:
proxyError("Unexpected message type: ${message.header.type}");
@@ -820,14 +847,15 @@ class UrlResponseDiskCacheProxy
}
- dynamic get(String url,[Function responseFactory = null]) {
+ void get(String url,void callback(url_response_mojom.UrlResponse response, List<int> filePath, List<int> cacheDirPath)) {
var params = new _UrlResponseDiskCacheGetParams();
params.url = url;
- return ctrl.sendMessageWithRequestId(
+ ctrl.sendMessageWithRequestId(
params,
_urlResponseDiskCacheMethodGetName,
-1,
- bindings.MessageHeader.kMessageExpectsResponse);
+ bindings.MessageHeader.kMessageExpectsResponse,
+ callback);
}
void validate(String url) {
if (!ctrl.isBound) {
@@ -849,23 +877,25 @@ class UrlResponseDiskCacheProxy
ctrl.sendMessage(params,
_urlResponseDiskCacheMethodUpdateName);
}
- dynamic updateAndGet(url_response_mojom.UrlResponse response,[Function responseFactory = null]) {
+ void updateAndGet(url_response_mojom.UrlResponse response,void callback(List<int> filePath, List<int> cacheDirPath)) {
var params = new _UrlResponseDiskCacheUpdateAndGetParams();
params.response = response;
- return ctrl.sendMessageWithRequestId(
+ ctrl.sendMessageWithRequestId(
params,
_urlResponseDiskCacheMethodUpdateAndGetName,
-1,
- bindings.MessageHeader.kMessageExpectsResponse);
+ bindings.MessageHeader.kMessageExpectsResponse,
+ callback);
}
- dynamic updateAndGetExtracted(url_response_mojom.UrlResponse response,[Function responseFactory = null]) {
+ void updateAndGetExtracted(url_response_mojom.UrlResponse response,void callback(List<int> extractedDirPath, List<int> cacheDirPath)) {
var params = new _UrlResponseDiskCacheUpdateAndGetExtractedParams();
params.response = response;
- return ctrl.sendMessageWithRequestId(
+ ctrl.sendMessageWithRequestId(
params,
_urlResponseDiskCacheMethodUpdateAndGetExtractedName,
-1,
- bindings.MessageHeader.kMessageExpectsResponse);
+ bindings.MessageHeader.kMessageExpectsResponse,
+ callback);
}
}
@@ -891,31 +921,52 @@ class _UrlResponseDiskCacheStubControl
String get serviceName => UrlResponseDiskCache.serviceName;
- UrlResponseDiskCacheGetResponseParams _urlResponseDiskCacheGetResponseParamsFactory(url_response_mojom.UrlResponse response, List<int> filePath, List<int> cacheDirPath) {
- var result = new UrlResponseDiskCacheGetResponseParams();
- result.response = response;
- result.filePath = filePath;
- result.cacheDirPath = cacheDirPath;
- return result;
- }
- UrlResponseDiskCacheUpdateAndGetResponseParams _urlResponseDiskCacheUpdateAndGetResponseParamsFactory(List<int> filePath, List<int> cacheDirPath) {
- var result = new UrlResponseDiskCacheUpdateAndGetResponseParams();
- result.filePath = filePath;
- result.cacheDirPath = cacheDirPath;
- return result;
- }
- UrlResponseDiskCacheUpdateAndGetExtractedResponseParams _urlResponseDiskCacheUpdateAndGetExtractedResponseParamsFactory(List<int> extractedDirPath, List<int> cacheDirPath) {
- var result = new UrlResponseDiskCacheUpdateAndGetExtractedResponseParams();
- result.extractedDirPath = extractedDirPath;
- result.cacheDirPath = cacheDirPath;
- return result;
- }
-
- dynamic handleMessage(bindings.ServiceMessage message) {
+ Function _urlResponseDiskCacheGetResponseParamsResponder(
+ int requestId) {
+ return (url_response_mojom.UrlResponse response, List<int> filePath, List<int> cacheDirPath) {
+ var result = new UrlResponseDiskCacheGetResponseParams();
+ result.response = response;
+ result.filePath = filePath;
+ result.cacheDirPath = cacheDirPath;
+ sendResponse(buildResponseWithId(
+ result,
+ _urlResponseDiskCacheMethodGetName,
+ requestId,
+ bindings.MessageHeader.kMessageIsResponse));
+ };
+ }
+ Function _urlResponseDiskCacheUpdateAndGetResponseParamsResponder(
+ int requestId) {
+ return (List<int> filePath, List<int> cacheDirPath) {
+ var result = new UrlResponseDiskCacheUpdateAndGetResponseParams();
+ result.filePath = filePath;
+ result.cacheDirPath = cacheDirPath;
+ sendResponse(buildResponseWithId(
+ result,
+ _urlResponseDiskCacheMethodUpdateAndGetName,
+ requestId,
+ bindings.MessageHeader.kMessageIsResponse));
+ };
+ }
+ Function _urlResponseDiskCacheUpdateAndGetExtractedResponseParamsResponder(
+ int requestId) {
+ return (List<int> extractedDirPath, List<int> cacheDirPath) {
+ var result = new UrlResponseDiskCacheUpdateAndGetExtractedResponseParams();
+ result.extractedDirPath = extractedDirPath;
+ result.cacheDirPath = cacheDirPath;
+ sendResponse(buildResponseWithId(
+ result,
+ _urlResponseDiskCacheMethodUpdateAndGetExtractedName,
+ 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");
@@ -924,24 +975,7 @@ class _UrlResponseDiskCacheStubControl
case _urlResponseDiskCacheMethodGetName:
var params = _UrlResponseDiskCacheGetParams.deserialize(
message.payload);
- var response = _impl.get(params.url,_urlResponseDiskCacheGetResponseParamsFactory);
- if (response is Future) {
- return response.then((response) {
- if (response != null) {
- return buildResponseWithId(
- response,
- _urlResponseDiskCacheMethodGetName,
- message.header.requestId,
- bindings.MessageHeader.kMessageIsResponse);
- }
- });
- } else if (response != null) {
- return buildResponseWithId(
- response,
- _urlResponseDiskCacheMethodGetName,
- message.header.requestId,
- bindings.MessageHeader.kMessageIsResponse);
- }
+ _impl.get(params.url, _urlResponseDiskCacheGetResponseParamsResponder(message.header.requestId));
break;
case _urlResponseDiskCacheMethodValidateName:
var params = _UrlResponseDiskCacheValidateParams.deserialize(
@@ -956,52 +990,17 @@ class _UrlResponseDiskCacheStubControl
case _urlResponseDiskCacheMethodUpdateAndGetName:
var params = _UrlResponseDiskCacheUpdateAndGetParams.deserialize(
message.payload);
- var response = _impl.updateAndGet(params.response,_urlResponseDiskCacheUpdateAndGetResponseParamsFactory);
- if (response is Future) {
- return response.then((response) {
- if (response != null) {
- return buildResponseWithId(
- response,
- _urlResponseDiskCacheMethodUpdateAndGetName,
- message.header.requestId,
- bindings.MessageHeader.kMessageIsResponse);
- }
- });
- } else if (response != null) {
- return buildResponseWithId(
- response,
- _urlResponseDiskCacheMethodUpdateAndGetName,
- message.header.requestId,
- bindings.MessageHeader.kMessageIsResponse);
- }
+ _impl.updateAndGet(params.response, _urlResponseDiskCacheUpdateAndGetResponseParamsResponder(message.header.requestId));
break;
case _urlResponseDiskCacheMethodUpdateAndGetExtractedName:
var params = _UrlResponseDiskCacheUpdateAndGetExtractedParams.deserialize(
message.payload);
- var response = _impl.updateAndGetExtracted(params.response,_urlResponseDiskCacheUpdateAndGetExtractedResponseParamsFactory);
- if (response is Future) {
- return response.then((response) {
- if (response != null) {
- return buildResponseWithId(
- response,
- _urlResponseDiskCacheMethodUpdateAndGetExtractedName,
- message.header.requestId,
- bindings.MessageHeader.kMessageIsResponse);
- }
- });
- } else if (response != null) {
- return buildResponseWithId(
- response,
- _urlResponseDiskCacheMethodUpdateAndGetExtractedName,
- message.header.requestId,
- bindings.MessageHeader.kMessageIsResponse);
- }
+ _impl.updateAndGetExtracted(params.response, _urlResponseDiskCacheUpdateAndGetExtractedResponseParamsResponder(message.header.requestId));
break;
default:
throw new bindings.MojoCodecError("Unexpected message name");
break;
}
- return null;
}
UrlResponseDiskCache get impl => _impl;
@@ -1055,8 +1054,8 @@ class UrlResponseDiskCacheStub
}
- dynamic get(String url,[Function responseFactory = null]) {
- return impl.get(url,responseFactory);
+ void get(String url,void callback(url_response_mojom.UrlResponse response, List<int> filePath, List<int> cacheDirPath)) {
+ return impl.get(url,callback);
}
void validate(String url) {
return impl.validate(url);
@@ -1064,11 +1063,11 @@ class UrlResponseDiskCacheStub
void update(url_response_mojom.UrlResponse response) {
return impl.update(response);
}
- dynamic updateAndGet(url_response_mojom.UrlResponse response,[Function responseFactory = null]) {
- return impl.updateAndGet(response,responseFactory);
+ void updateAndGet(url_response_mojom.UrlResponse response,void callback(List<int> filePath, List<int> cacheDirPath)) {
+ return impl.updateAndGet(response,callback);
}
- dynamic updateAndGetExtracted(url_response_mojom.UrlResponse response,[Function responseFactory = null]) {
- return impl.updateAndGetExtracted(response,responseFactory);
+ void updateAndGetExtracted(url_response_mojom.UrlResponse response,void callback(List<int> extractedDirPath, List<int> cacheDirPath)) {
+ return impl.updateAndGetExtracted(response,callback);
}
}
« examples/dart/echo_client/lib/main.dart ('K') | « mojo/dart/packages/mojo_services/lib/mojo/url_loader_interceptor.mojom.dart ('k') | mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698