| Index: Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
|
| diff --git a/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp b/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
|
| index 83fc1e9b49cd7b27a058efb3bc4b254f5108e7cb..9167c6bf53a6880d2b2e299c7e3290ca7a30c247 100644
|
| --- a/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
|
| +++ b/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
|
| @@ -122,11 +122,11 @@ public:
|
|
|
| ~RequestCacheNames() override { }
|
|
|
| - void onSuccess(WebVector<WebString>* caches)
|
| + void onSuccess(const WebVector<WebString>& caches) override
|
| {
|
| RefPtr<Array<Cache>> array = Array<Cache>::create();
|
| - for (size_t i = 0; i < caches->size(); i++) {
|
| - String name = String((*caches)[i]);
|
| + for (size_t i = 0; i < caches.size(); i++) {
|
| + String name = String(caches[i]);
|
| RefPtr<Cache> entry = Cache::create()
|
| .setSecurityOrigin(m_securityOrigin)
|
| .setCacheName(name)
|
| @@ -136,9 +136,9 @@ public:
|
| m_callback->sendSuccess(array);
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError* error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| - m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(*error).data()));
|
| + m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
|
| }
|
|
|
| private:
|
| @@ -229,14 +229,14 @@ public:
|
| }
|
| ~GetCacheResponsesForRequestData() override { }
|
|
|
| - void onSuccess(WebServiceWorkerResponse* response)
|
| + void onSuccess(const WebServiceWorkerResponse& response) override
|
| {
|
| - m_accumulator->addRequestResponsePair(m_request, *response);
|
| + m_accumulator->addRequestResponsePair(m_request, response);
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError* error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| - m_callback->sendFailure(String::format("Error requesting responses for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
|
| + m_callback->sendFailure(String::format("Error requesting responses for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
|
| }
|
|
|
| private:
|
| @@ -258,25 +258,26 @@ public:
|
| }
|
| ~GetCacheKeysForRequestData() override { }
|
|
|
| - void onSuccess(WebVector<WebServiceWorkerRequest>* requests)
|
| + WebServiceWorkerCache* cache() { return m_cache.get(); }
|
| + void onSuccess(const WebVector<WebServiceWorkerRequest>& requests) override
|
| {
|
| - if (requests->isEmpty()) {
|
| + if (requests.isEmpty()) {
|
| RefPtr<Array<DataEntry>> array = Array<DataEntry>::create();
|
| m_callback->sendSuccess(array, false);
|
| return;
|
| }
|
| - RefPtr<ResponsesAccumulator> accumulator = adoptRef(new ResponsesAccumulator(requests->size(), m_params, m_callback));
|
| + RefPtr<ResponsesAccumulator> accumulator = adoptRef(new ResponsesAccumulator(requests.size(), m_params, m_callback));
|
|
|
| - for (size_t i = 0; i < requests->size(); i++) {
|
| - const auto& request = (*requests)[i];
|
| + for (size_t i = 0; i < requests.size(); i++) {
|
| + const auto& request = requests[i];
|
| auto* cacheRequest = new GetCacheResponsesForRequestData(m_params, request, accumulator, m_callback);
|
| m_cache->dispatchMatch(cacheRequest, request, WebServiceWorkerCache::QueryParams());
|
| }
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError* error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| - m_callback->sendFailure(String::format("Error requesting requests for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
|
| + m_callback->sendFailure(String::format("Error requesting requests for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
|
| }
|
|
|
| private:
|
| @@ -297,15 +298,15 @@ public:
|
| }
|
| ~GetCacheForRequestData() override { }
|
|
|
| - void onSuccess(WebServiceWorkerCache* cache)
|
| + void onSuccess(WebPassOwnPtr<WebServiceWorkerCache> cache) override
|
| {
|
| - auto* cacheRequest = new GetCacheKeysForRequestData(m_params, adoptPtr(cache), m_callback);
|
| - cache->dispatchKeys(cacheRequest, nullptr, WebServiceWorkerCache::QueryParams());
|
| + auto* cacheRequest = new GetCacheKeysForRequestData(m_params, cache.release(), m_callback);
|
| + cacheRequest->cache()->dispatchKeys(cacheRequest, nullptr, WebServiceWorkerCache::QueryParams());
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError* error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| - m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
|
| + m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
|
| }
|
|
|
| private:
|
| @@ -323,14 +324,14 @@ public:
|
| }
|
| ~DeleteCache() override { }
|
|
|
| - void onSuccess()
|
| + void onSuccess() override
|
| {
|
| m_callback->sendSuccess();
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError* error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| - m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(*error).data()));
|
| + m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
|
| }
|
|
|
| private:
|
| @@ -347,12 +348,12 @@ public:
|
| }
|
| ~DeleteCacheEntry() override { }
|
|
|
| - void onSuccess()
|
| + void onSuccess() override
|
| {
|
| m_callback->sendSuccess();
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
|
| }
|
| @@ -374,20 +375,20 @@ public:
|
| }
|
| ~GetCacheForDeleteEntry() override { }
|
|
|
| - void onSuccess(WebServiceWorkerCache* cache)
|
| + void onSuccess(WebPassOwnPtr<WebServiceWorkerCache> cache) override
|
| {
|
| - auto* deleteRequest = new DeleteCacheEntry( m_callback);
|
| + auto* deleteRequest = new DeleteCacheEntry(m_callback);
|
| BatchOperation deleteOperation;
|
| deleteOperation.operationType = WebServiceWorkerCache::OperationTypeDelete;
|
| deleteOperation.request.setURL(KURL(ParsedURLString, m_requestSpec));
|
| Vector<BatchOperation> operations;
|
| operations.append(deleteOperation);
|
| - cache->dispatchBatch(deleteRequest, WebVector<BatchOperation>(operations));
|
| + cache.release()->dispatchBatch(deleteRequest, WebVector<BatchOperation>(operations));
|
| }
|
|
|
| - void onError(WebServiceWorkerCacheError* error)
|
| + void onError(WebServiceWorkerCacheError error) override
|
| {
|
| - m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_cacheName.utf8().data(), serviceWorkerCacheErrorString(*error).data()));
|
| + m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
|
| }
|
|
|
| private:
|
|
|