| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/cachestorage/CacheStorage.h" | 6 #include "modules/cachestorage/CacheStorage.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ScriptPromiseResolver.h" | 8 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 9 #include "bindings/core/v8/ScriptState.h" | 9 #include "bindings/core/v8/ScriptState.h" |
| 10 #include "core/dom/DOMException.h" | 10 #include "core/dom/DOMException.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 } | 25 } |
| 26 | 26 |
| 27 } | 27 } |
| 28 | 28 |
| 29 // FIXME: Consider using CallbackPromiseAdapter. | 29 // FIXME: Consider using CallbackPromiseAdapter. |
| 30 class CacheStorage::Callbacks final : public WebServiceWorkerCacheStorage::Cache
StorageCallbacks { | 30 class CacheStorage::Callbacks final : public WebServiceWorkerCacheStorage::Cache
StorageCallbacks { |
| 31 WTF_MAKE_NONCOPYABLE(Callbacks); | 31 WTF_MAKE_NONCOPYABLE(Callbacks); |
| 32 public: | 32 public: |
| 33 explicit Callbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) | 33 explicit Callbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) |
| 34 : m_resolver(resolver) { } | 34 : m_resolver(resolver) { } |
| 35 virtual ~Callbacks() { } | 35 ~Callbacks() override { } |
| 36 | 36 |
| 37 virtual void onSuccess() override | 37 void onSuccess() override |
| 38 { | 38 { |
| 39 m_resolver->resolve(true); | 39 m_resolver->resolve(true); |
| 40 m_resolver.clear(); | 40 m_resolver.clear(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 // Ownership of |rawReason| must be passed. | 43 // Ownership of |rawReason| must be passed. |
| 44 virtual void onError(WebServiceWorkerCacheError* rawReason) override | 44 void onError(WebServiceWorkerCacheError* rawReason) override |
| 45 { | 45 { |
| 46 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); | 46 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); |
| 47 if (*reason == WebServiceWorkerCacheErrorNotFound) | 47 if (*reason == WebServiceWorkerCacheErrorNotFound) |
| 48 m_resolver->resolve(false); | 48 m_resolver->resolve(false); |
| 49 else | 49 else |
| 50 m_resolver->reject(CacheStorageError::createException(*reason)); | 50 m_resolver->reject(CacheStorageError::createException(*reason)); |
| 51 m_resolver.clear(); | 51 m_resolver.clear(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 private: | 54 private: |
| 55 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; | 55 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 // FIXME: Consider using CallbackPromiseAdapter. | 58 // FIXME: Consider using CallbackPromiseAdapter. |
| 59 class CacheStorage::WithCacheCallbacks final : public WebServiceWorkerCacheStora
ge::CacheStorageWithCacheCallbacks { | 59 class CacheStorage::WithCacheCallbacks final : public WebServiceWorkerCacheStora
ge::CacheStorageWithCacheCallbacks { |
| 60 WTF_MAKE_NONCOPYABLE(WithCacheCallbacks); | 60 WTF_MAKE_NONCOPYABLE(WithCacheCallbacks); |
| 61 public: | 61 public: |
| 62 WithCacheCallbacks(const String& cacheName, CacheStorage* cacheStorage, Pass
RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) | 62 WithCacheCallbacks(const String& cacheName, CacheStorage* cacheStorage, Pass
RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) |
| 63 : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resol
ver) { } | 63 : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resol
ver) { } |
| 64 virtual ~WithCacheCallbacks() { } | 64 ~WithCacheCallbacks() override { } |
| 65 | 65 |
| 66 virtual void onSuccess(WebServiceWorkerCache* webCache) override | 66 void onSuccess(WebServiceWorkerCache* webCache) override |
| 67 { | 67 { |
| 68 // FIXME: Remove this once content's WebServiceWorkerCache implementatio
n has landed. | 68 // FIXME: Remove this once content's WebServiceWorkerCache implementatio
n has landed. |
| 69 if (!webCache) { | 69 if (!webCache) { |
| 70 m_resolver->reject("not implemented"); | 70 m_resolver->reject("not implemented"); |
| 71 return; | 71 return; |
| 72 } | 72 } |
| 73 Cache* cache = Cache::create(m_cacheStorage->m_scopedFetcher, webCache); | 73 Cache* cache = Cache::create(m_cacheStorage->m_scopedFetcher, webCache); |
| 74 m_cacheStorage->m_nameToCacheMap.set(m_cacheName, cache); | 74 m_cacheStorage->m_nameToCacheMap.set(m_cacheName, cache); |
| 75 m_resolver->resolve(cache); | 75 m_resolver->resolve(cache); |
| 76 m_resolver.clear(); | 76 m_resolver.clear(); |
| 77 } | 77 } |
| 78 | 78 |
| 79 // Ownership of |rawReason| must be passed. | 79 // Ownership of |rawReason| must be passed. |
| 80 virtual void onError(WebServiceWorkerCacheError* rawReason) override | 80 void onError(WebServiceWorkerCacheError* rawReason) override |
| 81 { | 81 { |
| 82 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); | 82 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); |
| 83 if (*reason == WebServiceWorkerCacheErrorNotFound) | 83 if (*reason == WebServiceWorkerCacheErrorNotFound) |
| 84 m_resolver->resolve(); | 84 m_resolver->resolve(); |
| 85 else | 85 else |
| 86 m_resolver->reject(CacheStorageError::createException(*reason)); | 86 m_resolver->reject(CacheStorageError::createException(*reason)); |
| 87 m_resolver.clear(); | 87 m_resolver.clear(); |
| 88 } | 88 } |
| 89 | 89 |
| 90 private: | 90 private: |
| 91 String m_cacheName; | 91 String m_cacheName; |
| 92 Persistent<CacheStorage> m_cacheStorage; | 92 Persistent<CacheStorage> m_cacheStorage; |
| 93 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; | 93 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 // FIXME: Consider using CallbackPromiseAdapter. | 96 // FIXME: Consider using CallbackPromiseAdapter. |
| 97 class CacheStorage::MatchCallbacks : public WebServiceWorkerCacheStorage::CacheS
torageMatchCallbacks { | 97 class CacheStorage::MatchCallbacks : public WebServiceWorkerCacheStorage::CacheS
torageMatchCallbacks { |
| 98 WTF_MAKE_NONCOPYABLE(MatchCallbacks); | 98 WTF_MAKE_NONCOPYABLE(MatchCallbacks); |
| 99 public: | 99 public: |
| 100 MatchCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) | 100 MatchCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) |
| 101 : m_resolver(resolver) { } | 101 : m_resolver(resolver) { } |
| 102 | 102 |
| 103 virtual void onSuccess(WebServiceWorkerResponse* webResponse) override | 103 void onSuccess(WebServiceWorkerResponse* webResponse) override |
| 104 { | 104 { |
| 105 m_resolver->resolve(Response::create(m_resolver->scriptState()->executio
nContext(), *webResponse)); | 105 m_resolver->resolve(Response::create(m_resolver->scriptState()->executio
nContext(), *webResponse)); |
| 106 m_resolver.clear(); | 106 m_resolver.clear(); |
| 107 } | 107 } |
| 108 | 108 |
| 109 // Ownership of |rawReason| must be passed. | 109 // Ownership of |rawReason| must be passed. |
| 110 virtual void onError(WebServiceWorkerCacheError* rawReason) override | 110 void onError(WebServiceWorkerCacheError* rawReason) override |
| 111 { | 111 { |
| 112 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); | 112 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); |
| 113 if (*reason == WebServiceWorkerCacheErrorNotFound) | 113 if (*reason == WebServiceWorkerCacheErrorNotFound) |
| 114 m_resolver->resolve(); | 114 m_resolver->resolve(); |
| 115 else | 115 else |
| 116 m_resolver->reject(CacheStorageError::createException(*reason)); | 116 m_resolver->reject(CacheStorageError::createException(*reason)); |
| 117 m_resolver.clear(); | 117 m_resolver.clear(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 private: | 120 private: |
| 121 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; | 121 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 | 124 |
| 125 // FIXME: Consider using CallbackPromiseAdapter. | 125 // FIXME: Consider using CallbackPromiseAdapter. |
| 126 class CacheStorage::DeleteCallbacks final : public WebServiceWorkerCacheStorage:
:CacheStorageCallbacks { | 126 class CacheStorage::DeleteCallbacks final : public WebServiceWorkerCacheStorage:
:CacheStorageCallbacks { |
| 127 WTF_MAKE_NONCOPYABLE(DeleteCallbacks); | 127 WTF_MAKE_NONCOPYABLE(DeleteCallbacks); |
| 128 public: | 128 public: |
| 129 DeleteCallbacks(const String& cacheName, CacheStorage* cacheStorage, PassRef
PtrWillBeRawPtr<ScriptPromiseResolver> resolver) | 129 DeleteCallbacks(const String& cacheName, CacheStorage* cacheStorage, PassRef
PtrWillBeRawPtr<ScriptPromiseResolver> resolver) |
| 130 : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resol
ver) { } | 130 : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resol
ver) { } |
| 131 virtual ~DeleteCallbacks() { } | 131 ~DeleteCallbacks() override { } |
| 132 | 132 |
| 133 virtual void onSuccess() override | 133 void onSuccess() override |
| 134 { | 134 { |
| 135 m_cacheStorage->m_nameToCacheMap.remove(m_cacheName); | 135 m_cacheStorage->m_nameToCacheMap.remove(m_cacheName); |
| 136 m_resolver->resolve(true); | 136 m_resolver->resolve(true); |
| 137 m_resolver.clear(); | 137 m_resolver.clear(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 // Ownership of |rawReason| must be passed. | 140 // Ownership of |rawReason| must be passed. |
| 141 virtual void onError(WebServiceWorkerCacheError* rawReason) override | 141 void onError(WebServiceWorkerCacheError* rawReason) override |
| 142 { | 142 { |
| 143 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); | 143 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); |
| 144 if (*reason == WebServiceWorkerCacheErrorNotFound) | 144 if (*reason == WebServiceWorkerCacheErrorNotFound) |
| 145 m_resolver->resolve(false); | 145 m_resolver->resolve(false); |
| 146 else | 146 else |
| 147 m_resolver->reject(CacheStorageError::createException(*reason)); | 147 m_resolver->reject(CacheStorageError::createException(*reason)); |
| 148 m_resolver.clear(); | 148 m_resolver.clear(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 private: | 151 private: |
| 152 String m_cacheName; | 152 String m_cacheName; |
| 153 Persistent<CacheStorage> m_cacheStorage; | 153 Persistent<CacheStorage> m_cacheStorage; |
| 154 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; | 154 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 // FIXME: Consider using CallbackPromiseAdapter. | 157 // FIXME: Consider using CallbackPromiseAdapter. |
| 158 class CacheStorage::KeysCallbacks final : public WebServiceWorkerCacheStorage::C
acheStorageKeysCallbacks { | 158 class CacheStorage::KeysCallbacks final : public WebServiceWorkerCacheStorage::C
acheStorageKeysCallbacks { |
| 159 WTF_MAKE_NONCOPYABLE(KeysCallbacks); | 159 WTF_MAKE_NONCOPYABLE(KeysCallbacks); |
| 160 public: | 160 public: |
| 161 explicit KeysCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolve
r) | 161 explicit KeysCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolve
r) |
| 162 : m_resolver(resolver) { } | 162 : m_resolver(resolver) { } |
| 163 virtual ~KeysCallbacks() { } | 163 ~KeysCallbacks() override { } |
| 164 | 164 |
| 165 virtual void onSuccess(WebVector<WebString>* keys) override | 165 void onSuccess(WebVector<WebString>* keys) override |
| 166 { | 166 { |
| 167 Vector<String> wtfKeys; | 167 Vector<String> wtfKeys; |
| 168 for (size_t i = 0; i < keys->size(); ++i) | 168 for (size_t i = 0; i < keys->size(); ++i) |
| 169 wtfKeys.append((*keys)[i]); | 169 wtfKeys.append((*keys)[i]); |
| 170 m_resolver->resolve(wtfKeys); | 170 m_resolver->resolve(wtfKeys); |
| 171 m_resolver.clear(); | 171 m_resolver.clear(); |
| 172 } | 172 } |
| 173 | 173 |
| 174 // Ownership of |rawReason| must be passed. | 174 // Ownership of |rawReason| must be passed. |
| 175 virtual void onError(WebServiceWorkerCacheError* rawReason) override | 175 void onError(WebServiceWorkerCacheError* rawReason) override |
| 176 { | 176 { |
| 177 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); | 177 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); |
| 178 m_resolver->reject(CacheStorageError::createException(*reason)); | 178 m_resolver->reject(CacheStorageError::createException(*reason)); |
| 179 m_resolver.clear(); | 179 m_resolver.clear(); |
| 180 } | 180 } |
| 181 | 181 |
| 182 private: | 182 private: |
| 183 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; | 183 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; |
| 184 }; | 184 }; |
| 185 | 185 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 { | 293 { |
| 294 m_webCacheStorage.clear(); | 294 m_webCacheStorage.clear(); |
| 295 } | 295 } |
| 296 | 296 |
| 297 DEFINE_TRACE(CacheStorage) | 297 DEFINE_TRACE(CacheStorage) |
| 298 { | 298 { |
| 299 visitor->trace(m_nameToCacheMap); | 299 visitor->trace(m_nameToCacheMap); |
| 300 } | 300 } |
| 301 | 301 |
| 302 } // namespace blink | 302 } // namespace blink |
| OLD | NEW |