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/dom/ExceptionCode.h" | 15 #include "core/dom/ExceptionCode.h" |
16 #include "core/inspector/ConsoleMessage.h" | 16 #include "core/inspector/ConsoleMessage.h" |
17 #include "modules/cachestorage/CacheStorageError.h" | 17 #include "modules/cachestorage/CacheStorageError.h" |
18 #include "modules/fetch/BodyStreamBuffer.h" | 18 #include "modules/fetch/BodyStreamBuffer.h" |
19 #include "modules/fetch/FetchDataLoader.h" | 19 #include "modules/fetch/FetchDataLoader.h" |
20 #include "modules/fetch/GlobalFetch.h" | 20 #include "modules/fetch/GlobalFetch.h" |
21 #include "modules/fetch/Request.h" | 21 #include "modules/fetch/Request.h" |
22 #include "modules/fetch/Response.h" | 22 #include "modules/fetch/Response.h" |
23 #include "platform/HTTPNames.h" | 23 #include "platform/HTTPNames.h" |
24 #include "platform/Histogram.h" | 24 #include "platform/Histogram.h" |
| 25 #include "platform/RuntimeEnabledFeatures.h" |
25 #include "public/platform/WebPassOwnPtr.h" | 26 #include "public/platform/WebPassOwnPtr.h" |
26 #include "public/platform/modules/serviceworker/WebServiceWorkerCache.h" | 27 #include "public/platform/modules/serviceworker/WebServiceWorkerCache.h" |
27 | 28 |
28 namespace blink { | 29 namespace blink { |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
32 void checkCacheQueryOptions(const CacheQueryOptions& options, ExecutionContext*
context) | 33 void checkCacheQueryOptions(const CacheQueryOptions& options, ExecutionContext*
context) |
33 { | 34 { |
34 if (options.ignoreSearch()) | 35 if (!RuntimeEnabledFeatures::cacheIgnoreSearchOptionEnabled() && options.ign
oreSearch()) |
35 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreSearch' option yet. See h
ttp://crbug.com/520784")); | 36 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreSearch' option yet. See h
ttp://crbug.com/520784")); |
36 if (options.ignoreMethod()) | 37 if (options.ignoreMethod()) |
37 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreMethod' option yet. See h
ttp://crbug.com/482256")); | 38 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreMethod' option yet. See h
ttp://crbug.com/482256")); |
38 if (options.ignoreVary()) | 39 if (options.ignoreVary()) |
39 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreVary' option yet. See htt
p://crbug.com/499216")); | 40 context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, Warni
ngMessageLevel, "Cache.match() does not support 'ignoreVary' option yet. See htt
p://crbug.com/499216")); |
40 } | 41 } |
41 | 42 |
42 // FIXME: Consider using CallbackPromiseAdapter. | 43 // FIXME: Consider using CallbackPromiseAdapter. |
43 class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks { | 44 class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks { |
44 WTF_MAKE_NONCOPYABLE(CacheMatchCallbacks); | 45 WTF_MAKE_NONCOPYABLE(CacheMatchCallbacks); |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 Request* newRequest = Request::create(scriptState, request.getAsUSVString(),
exceptionState); | 458 Request* newRequest = Request::create(scriptState, request.getAsUSVString(),
exceptionState); |
458 if (exceptionState.hadException()) | 459 if (exceptionState.hadException()) |
459 return ScriptPromise(); | 460 return ScriptPromise(); |
460 return keysImpl(scriptState, newRequest, options); | 461 return keysImpl(scriptState, newRequest, options); |
461 } | 462 } |
462 | 463 |
463 // static | 464 // static |
464 WebServiceWorkerCache::QueryParams Cache::toWebQueryParams(const CacheQueryOptio
ns& options) | 465 WebServiceWorkerCache::QueryParams Cache::toWebQueryParams(const CacheQueryOptio
ns& options) |
465 { | 466 { |
466 WebServiceWorkerCache::QueryParams webQueryParams; | 467 WebServiceWorkerCache::QueryParams webQueryParams; |
467 webQueryParams.ignoreSearch = options.ignoreSearch(); | 468 webQueryParams.ignoreSearch = options.ignoreSearch() && RuntimeEnabledFeatur
es::cacheIgnoreSearchOptionEnabled(); |
468 webQueryParams.ignoreMethod = options.ignoreMethod(); | 469 webQueryParams.ignoreMethod = options.ignoreMethod(); |
469 webQueryParams.ignoreVary = options.ignoreVary(); | 470 webQueryParams.ignoreVary = options.ignoreVary(); |
470 webQueryParams.cacheName = options.cacheName(); | 471 webQueryParams.cacheName = options.cacheName(); |
471 return webQueryParams; | 472 return webQueryParams; |
472 } | 473 } |
473 | 474 |
474 Cache::Cache(WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher> fetcher, PassOwnPtr
<WebServiceWorkerCache> webCache) | 475 Cache::Cache(WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher> fetcher, PassOwnPtr
<WebServiceWorkerCache> webCache) |
475 : m_scopedFetcher(fetcher) | 476 : m_scopedFetcher(fetcher) |
476 , m_webCache(webCache) | 477 , m_webCache(webCache) |
477 { | 478 { |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQ
ueryParams(options)); | 617 m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQ
ueryParams(options)); |
617 return promise; | 618 return promise; |
618 } | 619 } |
619 | 620 |
620 WebServiceWorkerCache* Cache::webCache() const | 621 WebServiceWorkerCache* Cache::webCache() const |
621 { | 622 { |
622 return m_webCache.get(); | 623 return m_webCache.get(); |
623 } | 624 } |
624 | 625 |
625 } // namespace blink | 626 } // namespace blink |
OLD | NEW |