| 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/Cache.h" | 5 #include "modules/cachestorage/Cache.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/CallbackPromiseAdapter.h" | 7 #include "bindings/core/v8/CallbackPromiseAdapter.h" |
| 8 #include "bindings/core/v8/ExceptionState.h" | 8 #include "bindings/core/v8/ExceptionState.h" |
| 9 #include "bindings/core/v8/ScriptPromiseResolver.h" | 9 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 10 #include "bindings/core/v8/ScriptState.h" | 10 #include "bindings/core/v8/ScriptState.h" |
| 11 #include "bindings/core/v8/V8Binding.h" | 11 #include "bindings/core/v8/V8Binding.h" |
| 12 #include "bindings/core/v8/V8ThrowException.h" | 12 #include "bindings/core/v8/V8ThrowException.h" |
| 13 #include "bindings/modules/v8/V8Response.h" | 13 #include "bindings/modules/v8/V8Response.h" |
| 14 #include "core/dom/DOMException.h" | 14 #include "core/dom/DOMException.h" |
| 15 #include "core/inspector/ConsoleMessage.h" | 15 #include "core/inspector/ConsoleMessage.h" |
| 16 #include "modules/cachestorage/CacheStorageError.h" | 16 #include "modules/cachestorage/CacheStorageError.h" |
| 17 #include "modules/fetch/BodyStreamBuffer.h" | 17 #include "modules/fetch/BodyStreamBuffer.h" |
| 18 #include "modules/fetch/FetchDataLoader.h" | 18 #include "modules/fetch/FetchDataLoader.h" |
| 19 #include "modules/fetch/GlobalFetch.h" | 19 #include "modules/fetch/GlobalFetch.h" |
| 20 #include "modules/fetch/Request.h" | 20 #include "modules/fetch/Request.h" |
| 21 #include "modules/fetch/Response.h" | 21 #include "modules/fetch/Response.h" |
| 22 #include "platform/HTTPNames.h" | 22 #include "platform/HTTPNames.h" |
| 23 #include "platform/Histogram.h" | 23 #include "platform/Histogram.h" |
| 24 #include "platform/RuntimeEnabledFeatures.h" | 24 #include "platform/RuntimeEnabledFeatures.h" |
| 25 #include "public/platform/modules/serviceworker/WebServiceWorkerCache.h" | 25 #include "public/platform/modules/serviceworker/WebServiceWorkerCache.h" |
| 26 | |
| 27 #include <memory> | 26 #include <memory> |
| 28 | 27 |
| 29 namespace blink { | 28 namespace blink { |
| 30 | 29 |
| 31 namespace { | 30 namespace { |
| 32 | 31 |
| 33 void checkCacheQueryOptions(const CacheQueryOptions& options, ExecutionContext*
context) | 32 void checkCacheQueryOptions(const CacheQueryOptions& options, ExecutionContext*
context) |
| 34 { | 33 { |
| 35 if (!RuntimeEnabledFeatures::cacheIgnoreSearchOptionEnabled() && options.ign
oreSearch()) | 34 if (!RuntimeEnabledFeatures::cacheIgnoreSearchOptionEnabled() && options.ign
oreSearch()) |
| 36 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreSearch' option yet. See h
ttp://crbug.com/520784")); | 35 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreSearch' option yet. See h
ttp://crbug.com/520784")); |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 } | 352 } |
| 354 | 353 |
| 355 private: | 354 private: |
| 356 const size_t m_index; | 355 const size_t m_index; |
| 357 Member<BarrierCallbackForPut> m_barrierCallback; | 356 Member<BarrierCallbackForPut> m_barrierCallback; |
| 358 | 357 |
| 359 WebServiceWorkerRequest m_webRequest; | 358 WebServiceWorkerRequest m_webRequest; |
| 360 WebServiceWorkerResponse m_webResponse; | 359 WebServiceWorkerResponse m_webResponse; |
| 361 }; | 360 }; |
| 362 | 361 |
| 363 Cache* Cache::create(GlobalFetch::ScopedFetcher* fetcher, PassOwnPtr<WebServiceW
orkerCache> webCache) | 362 Cache* Cache::create(GlobalFetch::ScopedFetcher* fetcher, std::unique_ptr<WebSer
viceWorkerCache> webCache) |
| 364 { | 363 { |
| 365 return new Cache(fetcher, std::move(webCache)); | 364 return new Cache(fetcher, std::move(webCache)); |
| 366 } | 365 } |
| 367 | 366 |
| 368 ScriptPromise Cache::match(ScriptState* scriptState, const RequestInfo& request,
const CacheQueryOptions& options, ExceptionState& exceptionState) | 367 ScriptPromise Cache::match(ScriptState* scriptState, const RequestInfo& request,
const CacheQueryOptions& options, ExceptionState& exceptionState) |
| 369 { | 368 { |
| 370 ASSERT(!request.isNull()); | 369 ASSERT(!request.isNull()); |
| 371 if (request.isRequest()) | 370 if (request.isRequest()) |
| 372 return matchImpl(scriptState, request.getAsRequest(), options); | 371 return matchImpl(scriptState, request.getAsRequest(), options); |
| 373 Request* newRequest = Request::create(scriptState, request.getAsUSVString(),
exceptionState); | 372 Request* newRequest = Request::create(scriptState, request.getAsUSVString(),
exceptionState); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 WebServiceWorkerCache::QueryParams Cache::toWebQueryParams(const CacheQueryOptio
ns& options) | 464 WebServiceWorkerCache::QueryParams Cache::toWebQueryParams(const CacheQueryOptio
ns& options) |
| 466 { | 465 { |
| 467 WebServiceWorkerCache::QueryParams webQueryParams; | 466 WebServiceWorkerCache::QueryParams webQueryParams; |
| 468 webQueryParams.ignoreSearch = options.ignoreSearch() && RuntimeEnabledFeatur
es::cacheIgnoreSearchOptionEnabled(); | 467 webQueryParams.ignoreSearch = options.ignoreSearch() && RuntimeEnabledFeatur
es::cacheIgnoreSearchOptionEnabled(); |
| 469 webQueryParams.ignoreMethod = options.ignoreMethod(); | 468 webQueryParams.ignoreMethod = options.ignoreMethod(); |
| 470 webQueryParams.ignoreVary = options.ignoreVary(); | 469 webQueryParams.ignoreVary = options.ignoreVary(); |
| 471 webQueryParams.cacheName = options.cacheName(); | 470 webQueryParams.cacheName = options.cacheName(); |
| 472 return webQueryParams; | 471 return webQueryParams; |
| 473 } | 472 } |
| 474 | 473 |
| 475 Cache::Cache(GlobalFetch::ScopedFetcher* fetcher, PassOwnPtr<WebServiceWorkerCac
he> webCache) | 474 Cache::Cache(GlobalFetch::ScopedFetcher* fetcher, std::unique_ptr<WebServiceWork
erCache> webCache) |
| 476 : m_scopedFetcher(fetcher) | 475 : m_scopedFetcher(fetcher) |
| 477 , m_webCache(std::move(webCache)) | 476 , m_webCache(std::move(webCache)) |
| 478 { | 477 { |
| 479 } | 478 } |
| 480 | 479 |
| 481 DEFINE_TRACE(Cache) | 480 DEFINE_TRACE(Cache) |
| 482 { | 481 { |
| 483 visitor->trace(m_scopedFetcher); | 482 visitor->trace(m_scopedFetcher); |
| 484 } | 483 } |
| 485 | 484 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQ
ueryParams(options)); | 616 m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQ
ueryParams(options)); |
| 618 return promise; | 617 return promise; |
| 619 } | 618 } |
| 620 | 619 |
| 621 WebServiceWorkerCache* Cache::webCache() const | 620 WebServiceWorkerCache* Cache::webCache() const |
| 622 { | 621 { |
| 623 return m_webCache.get(); | 622 return m_webCache.get(); |
| 624 } | 623 } |
| 625 | 624 |
| 626 } // namespace blink | 625 } // namespace blink |
| OLD | NEW |