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

Unified Diff: Source/modules/cachestorage/Cache.cpp

Issue 1284173004: [CacheStorage] Use appopriate type parameters for WebCallbacks (1/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
« no previous file with comments | « no previous file | Source/modules/cachestorage/CacheStorage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/cachestorage/Cache.cpp
diff --git a/Source/modules/cachestorage/Cache.cpp b/Source/modules/cachestorage/Cache.cpp
index 6836b833a03bc8f69e320ea7d2493354a7245c5b..73c7f8a64a7ab64cd16ffe11f1e07517eb8ae14b 100644
--- a/Source/modules/cachestorage/Cache.cpp
+++ b/Source/modules/cachestorage/Cache.cpp
@@ -34,24 +34,22 @@ public:
explicit CacheMatchCallbacks(ScriptPromiseResolver* resolver)
: m_resolver(resolver) { }
- void onSuccess(WebServiceWorkerResponse* webResponse) override
+ void onSuccess(const WebServiceWorkerResponse& webResponse) override
{
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
- m_resolver->resolve(Response::create(m_resolver->scriptState()->executionContext(), *webResponse));
+ m_resolver->resolve(Response::create(m_resolver->scriptState()->executionContext(), webResponse));
m_resolver.clear();
}
- // Ownership of |rawReason| must be passed.
- void onError(WebServiceWorkerCacheError* rawReason) override
+ void onError(WebServiceWorkerCacheError reason) override
{
- OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
- if (*reason == WebServiceWorkerCacheErrorNotFound)
+ if (reason == WebServiceWorkerCacheErrorNotFound)
m_resolver->resolve();
else
- m_resolver->reject(CacheStorageError::createException(*reason));
+ m_resolver->reject(CacheStorageError::createException(reason));
m_resolver.clear();
}
@@ -66,24 +64,22 @@ public:
explicit CacheWithResponsesCallbacks(ScriptPromiseResolver* resolver)
: m_resolver(resolver) { }
- void onSuccess(WebVector<WebServiceWorkerResponse>* webResponses) override
+ void onSuccess(const WebVector<WebServiceWorkerResponse>& webResponses) override
{
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
HeapVector<Member<Response>> responses;
- for (size_t i = 0; i < webResponses->size(); ++i)
- responses.append(Response::create(m_resolver->scriptState()->executionContext(), (*webResponses)[i]));
+ for (size_t i = 0; i < webResponses.size(); ++i)
+ responses.append(Response::create(m_resolver->scriptState()->executionContext(), webResponses[i]));
m_resolver->resolve(responses);
m_resolver.clear();
}
- // Ownership of |rawReason| must be passed.
- void onError(WebServiceWorkerCacheError* rawReason) override
+ void onError(WebServiceWorkerCacheError reason) override
{
- OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
- m_resolver->reject(CacheStorageError::createException(*reason));
+ m_resolver->reject(CacheStorageError::createException(reason));
m_resolver.clear();
}
@@ -128,24 +124,22 @@ public:
explicit CacheWithRequestsCallbacks(ScriptPromiseResolver* resolver)
: m_resolver(resolver) { }
- void onSuccess(WebVector<WebServiceWorkerRequest>* webRequests) override
+ void onSuccess(const WebVector<WebServiceWorkerRequest>& webRequests) override
{
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
HeapVector<Member<Request>> requests;
- for (size_t i = 0; i < webRequests->size(); ++i)
- requests.append(Request::create(m_resolver->scriptState()->executionContext(), (*webRequests)[i]));
+ for (size_t i = 0; i < webRequests.size(); ++i)
+ requests.append(Request::create(m_resolver->scriptState()->executionContext(), webRequests[i]));
m_resolver->resolve(requests);
m_resolver.clear();
}
- // Ownership of |rawReason| must be passed.
- void onError(WebServiceWorkerCacheError* rawReason) override
+ void onError(WebServiceWorkerCacheError reason) override
{
- OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
- m_resolver->reject(CacheStorageError::createException(*reason));
+ m_resolver->reject(CacheStorageError::createException(reason));
m_resolver.clear();
}
« no previous file with comments | « no previous file | Source/modules/cachestorage/CacheStorage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698