| 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 "modules/cachestorage/CacheStorage.h" | 5 #include "modules/cachestorage/CacheStorage.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
| 9 #include "core/dom/DOMException.h" | 9 #include "core/dom/DOMException.h" |
| 10 #include "core/dom/ExceptionCode.h" | 10 #include "core/dom/ExceptionCode.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContex
t()->activeDOMObjectsAreStopped()) | 207 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContex
t()->activeDOMObjectsAreStopped()) |
| 208 return; | 208 return; |
| 209 m_resolver->reject(CacheStorageError::createException(reason)); | 209 m_resolver->reject(CacheStorageError::createException(reason)); |
| 210 m_resolver.clear(); | 210 m_resolver.clear(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 private: | 213 private: |
| 214 Persistent<ScriptPromiseResolver> m_resolver; | 214 Persistent<ScriptPromiseResolver> m_resolver; |
| 215 }; | 215 }; |
| 216 | 216 |
| 217 CacheStorage* CacheStorage::create(WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetche
r> fetcher, WebServiceWorkerCacheStorage* webCacheStorage) | 217 CacheStorage* CacheStorage::create(RawPtr<GlobalFetch::ScopedFetcher> fetcher, W
ebServiceWorkerCacheStorage* webCacheStorage) |
| 218 { | 218 { |
| 219 return new CacheStorage(fetcher, adoptPtr(webCacheStorage)); | 219 return new CacheStorage(fetcher, adoptPtr(webCacheStorage)); |
| 220 } | 220 } |
| 221 | 221 |
| 222 ScriptPromise CacheStorage::open(ScriptState* scriptState, const String& cacheNa
me, ExceptionState& exceptionState) | 222 ScriptPromise CacheStorage::open(ScriptState* scriptState, const String& cacheNa
me, ExceptionState& exceptionState) |
| 223 { | 223 { |
| 224 if (!commonChecks(scriptState, exceptionState)) | 224 if (!commonChecks(scriptState, exceptionState)) |
| 225 return ScriptPromise(); | 225 return ScriptPromise(); |
| 226 | 226 |
| 227 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 227 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 const ScriptPromise promise = resolver->promise(); | 318 const ScriptPromise promise = resolver->promise(); |
| 319 | 319 |
| 320 if (m_webCacheStorage) | 320 if (m_webCacheStorage) |
| 321 m_webCacheStorage->dispatchMatch(new MatchCallbacks(resolver), webReques
t, Cache::toWebQueryParams(options)); | 321 m_webCacheStorage->dispatchMatch(new MatchCallbacks(resolver), webReques
t, Cache::toWebQueryParams(options)); |
| 322 else | 322 else |
| 323 resolver->reject(createNoImplementationException()); | 323 resolver->reject(createNoImplementationException()); |
| 324 | 324 |
| 325 return promise; | 325 return promise; |
| 326 } | 326 } |
| 327 | 327 |
| 328 CacheStorage::CacheStorage(WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher> fetch
er, PassOwnPtr<WebServiceWorkerCacheStorage> webCacheStorage) | 328 CacheStorage::CacheStorage(RawPtr<GlobalFetch::ScopedFetcher> fetcher, PassOwnPt
r<WebServiceWorkerCacheStorage> webCacheStorage) |
| 329 : m_scopedFetcher(fetcher) | 329 : m_scopedFetcher(fetcher) |
| 330 , m_webCacheStorage(webCacheStorage) | 330 , m_webCacheStorage(webCacheStorage) |
| 331 { | 331 { |
| 332 } | 332 } |
| 333 | 333 |
| 334 CacheStorage::~CacheStorage() | 334 CacheStorage::~CacheStorage() |
| 335 { | 335 { |
| 336 } | 336 } |
| 337 | 337 |
| 338 void CacheStorage::dispose() | 338 void CacheStorage::dispose() |
| 339 { | 339 { |
| 340 m_webCacheStorage.clear(); | 340 m_webCacheStorage.clear(); |
| 341 } | 341 } |
| 342 | 342 |
| 343 DEFINE_TRACE(CacheStorage) | 343 DEFINE_TRACE(CacheStorage) |
| 344 { | 344 { |
| 345 visitor->trace(m_scopedFetcher); | 345 visitor->trace(m_scopedFetcher); |
| 346 visitor->trace(m_nameToCacheMap); | 346 visitor->trace(m_nameToCacheMap); |
| 347 } | 347 } |
| 348 | 348 |
| 349 } // namespace blink | 349 } // namespace blink |
| OLD | NEW |