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

Unified Diff: third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp

Issue 2203543002: [DevTools] Dont pass errorString to async protocol methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 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
Index: third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
diff --git a/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp b/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
index 232b7e3c4816862cab2a767cb7f48ee75d28a3db..07fefac0e6cf1562ecf6148c0a10703badd3e387 100644
--- a/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
+++ b/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
@@ -406,7 +406,7 @@ DEFINE_TRACE(InspectorCacheStorageAgent)
InspectorBaseAgent::trace(visitor);
}
-void InspectorCacheStorageAgent::requestCacheNames(ErrorString* errorString, const String& securityOrigin, std::unique_ptr<RequestCacheNamesCallback> callback)
+void InspectorCacheStorageAgent::requestCacheNames(const String& securityOrigin, std::unique_ptr<RequestCacheNamesCallback> callback)
{
RefPtr<SecurityOrigin> secOrigin = SecurityOrigin::createFromString(securityOrigin);
@@ -417,20 +417,22 @@ void InspectorCacheStorageAgent::requestCacheNames(ErrorString* errorString, con
return;
}
- std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, securityOrigin);
+ ErrorString errorString;
+ std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(&errorString, securityOrigin);
if (!cache) {
- callback->sendFailure(*errorString);
+ callback->sendFailure(errorString);
return;
}
cache->dispatchKeys(new RequestCacheNames(securityOrigin, std::move(callback)));
}
-void InspectorCacheStorageAgent::requestEntries(ErrorString* errorString, const String& cacheId, int skipCount, int pageSize, std::unique_ptr<RequestEntriesCallback> callback)
+void InspectorCacheStorageAgent::requestEntries(const String& cacheId, int skipCount, int pageSize, std::unique_ptr<RequestEntriesCallback> callback)
{
+ ErrorString errorString;
String cacheName;
- std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
+ std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(&errorString, cacheId, &cacheName);
if (!cache) {
- callback->sendFailure(*errorString);
+ callback->sendFailure(errorString);
return;
}
DataRequestParams params;
@@ -440,23 +442,25 @@ void InspectorCacheStorageAgent::requestEntries(ErrorString* errorString, const
cache->dispatchOpen(new GetCacheForRequestData(params, std::move(callback)), WebString(cacheName));
}
-void InspectorCacheStorageAgent::deleteCache(ErrorString* errorString, const String& cacheId, std::unique_ptr<DeleteCacheCallback> callback)
+void InspectorCacheStorageAgent::deleteCache(const String& cacheId, std::unique_ptr<DeleteCacheCallback> callback)
{
String cacheName;
- std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
+ ErrorString errorString;
+ std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(&errorString, cacheId, &cacheName);
if (!cache) {
- callback->sendFailure(*errorString);
+ callback->sendFailure(errorString);
return;
}
cache->dispatchDelete(new DeleteCache(std::move(callback)), WebString(cacheName));
}
-void InspectorCacheStorageAgent::deleteEntry(ErrorString* errorString, const String& cacheId, const String& request, std::unique_ptr<DeleteEntryCallback> callback)
+void InspectorCacheStorageAgent::deleteEntry(const String& cacheId, const String& request, std::unique_ptr<DeleteEntryCallback> callback)
{
String cacheName;
- std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
+ ErrorString errorString;
+ std::unique_ptr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(&errorString, cacheId, &cacheName);
if (!cache) {
- callback->sendFailure(*errorString);
+ callback->sendFailure(errorString);
return;
}
cache->dispatchOpen(new GetCacheForDeleteEntry(request, cacheName, std::move(callback)), WebString(cacheName));

Powered by Google App Engine
This is Rietveld 408576698