| Index: Source/modules/cachestorage/CacheStorage.cpp
|
| diff --git a/Source/modules/cachestorage/CacheStorage.cpp b/Source/modules/cachestorage/CacheStorage.cpp
|
| index 4961a3fa425ef4fa40a96aa96f7531f7b8449511..86ffcb2ac4a93601d43240c5964e44c217af0342 100644
|
| --- a/Source/modules/cachestorage/CacheStorage.cpp
|
| +++ b/Source/modules/cachestorage/CacheStorage.cpp
|
| @@ -32,16 +32,16 @@ class CacheStorage::Callbacks final : public WebServiceWorkerCacheStorage::Cache
|
| public:
|
| explicit Callbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
|
| : m_resolver(resolver) { }
|
| - virtual ~Callbacks() { }
|
| + ~Callbacks() override { }
|
|
|
| - virtual void onSuccess() override
|
| + void onSuccess() override
|
| {
|
| m_resolver->resolve(true);
|
| m_resolver.clear();
|
| }
|
|
|
| // Ownership of |rawReason| must be passed.
|
| - virtual void onError(WebServiceWorkerCacheError* rawReason) override
|
| + void onError(WebServiceWorkerCacheError* rawReason) override
|
| {
|
| OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
|
| if (*reason == WebServiceWorkerCacheErrorNotFound)
|
| @@ -61,9 +61,9 @@ class CacheStorage::WithCacheCallbacks final : public WebServiceWorkerCacheStora
|
| public:
|
| WithCacheCallbacks(const String& cacheName, CacheStorage* cacheStorage, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
|
| : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resolver) { }
|
| - virtual ~WithCacheCallbacks() { }
|
| + ~WithCacheCallbacks() override { }
|
|
|
| - virtual void onSuccess(WebServiceWorkerCache* webCache) override
|
| + void onSuccess(WebServiceWorkerCache* webCache) override
|
| {
|
| // FIXME: Remove this once content's WebServiceWorkerCache implementation has landed.
|
| if (!webCache) {
|
| @@ -77,7 +77,7 @@ public:
|
| }
|
|
|
| // Ownership of |rawReason| must be passed.
|
| - virtual void onError(WebServiceWorkerCacheError* rawReason) override
|
| + void onError(WebServiceWorkerCacheError* rawReason) override
|
| {
|
| OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
|
| if (*reason == WebServiceWorkerCacheErrorNotFound)
|
| @@ -100,14 +100,14 @@ public:
|
| MatchCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
|
| : m_resolver(resolver) { }
|
|
|
| - virtual void onSuccess(WebServiceWorkerResponse* webResponse) override
|
| + void onSuccess(WebServiceWorkerResponse* webResponse) override
|
| {
|
| m_resolver->resolve(Response::create(m_resolver->scriptState()->executionContext(), *webResponse));
|
| m_resolver.clear();
|
| }
|
|
|
| // Ownership of |rawReason| must be passed.
|
| - virtual void onError(WebServiceWorkerCacheError* rawReason) override
|
| + void onError(WebServiceWorkerCacheError* rawReason) override
|
| {
|
| OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
|
| if (*reason == WebServiceWorkerCacheErrorNotFound)
|
| @@ -128,9 +128,9 @@ class CacheStorage::DeleteCallbacks final : public WebServiceWorkerCacheStorage:
|
| public:
|
| DeleteCallbacks(const String& cacheName, CacheStorage* cacheStorage, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
|
| : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resolver) { }
|
| - virtual ~DeleteCallbacks() { }
|
| + ~DeleteCallbacks() override { }
|
|
|
| - virtual void onSuccess() override
|
| + void onSuccess() override
|
| {
|
| m_cacheStorage->m_nameToCacheMap.remove(m_cacheName);
|
| m_resolver->resolve(true);
|
| @@ -138,7 +138,7 @@ public:
|
| }
|
|
|
| // Ownership of |rawReason| must be passed.
|
| - virtual void onError(WebServiceWorkerCacheError* rawReason) override
|
| + void onError(WebServiceWorkerCacheError* rawReason) override
|
| {
|
| OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
|
| if (*reason == WebServiceWorkerCacheErrorNotFound)
|
| @@ -160,9 +160,9 @@ class CacheStorage::KeysCallbacks final : public WebServiceWorkerCacheStorage::C
|
| public:
|
| explicit KeysCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
|
| : m_resolver(resolver) { }
|
| - virtual ~KeysCallbacks() { }
|
| + ~KeysCallbacks() override { }
|
|
|
| - virtual void onSuccess(WebVector<WebString>* keys) override
|
| + void onSuccess(WebVector<WebString>* keys) override
|
| {
|
| Vector<String> wtfKeys;
|
| for (size_t i = 0; i < keys->size(); ++i)
|
| @@ -172,7 +172,7 @@ public:
|
| }
|
|
|
| // Ownership of |rawReason| must be passed.
|
| - virtual void onError(WebServiceWorkerCacheError* rawReason) override
|
| + void onError(WebServiceWorkerCacheError* rawReason) override
|
| {
|
| OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
|
| m_resolver->reject(CacheStorageError::createException(*reason));
|
|
|