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 "content/renderer/cache_storage/cache_storage_dispatcher.h" | 5 #include "content/renderer/cache_storage/cache_storage_dispatcher.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 26 matching lines...) Expand all Loading... |
37 | 37 |
38 CacheStorageDispatcher* const kHasBeenDeleted = | 38 CacheStorageDispatcher* const kHasBeenDeleted = |
39 reinterpret_cast<CacheStorageDispatcher*>(0x1); | 39 reinterpret_cast<CacheStorageDispatcher*>(0x1); |
40 | 40 |
41 ServiceWorkerFetchRequest FetchRequestFromWebRequest( | 41 ServiceWorkerFetchRequest FetchRequestFromWebRequest( |
42 const blink::WebServiceWorkerRequest& web_request) { | 42 const blink::WebServiceWorkerRequest& web_request) { |
43 ServiceWorkerHeaderMap headers; | 43 ServiceWorkerHeaderMap headers; |
44 GetServiceWorkerHeaderMapFromWebRequest(web_request, &headers); | 44 GetServiceWorkerHeaderMapFromWebRequest(web_request, &headers); |
45 | 45 |
46 return ServiceWorkerFetchRequest( | 46 return ServiceWorkerFetchRequest( |
47 web_request.url(), base::UTF16ToASCII(web_request.method()), headers, | 47 web_request.url(), |
| 48 base::UTF16ToASCII(base::StringPiece16(web_request.method())), headers, |
48 Referrer(web_request.referrerUrl(), web_request.referrerPolicy()), | 49 Referrer(web_request.referrerUrl(), web_request.referrerPolicy()), |
49 web_request.isReload()); | 50 web_request.isReload()); |
50 } | 51 } |
51 | 52 |
52 void PopulateWebRequestFromFetchRequest( | 53 void PopulateWebRequestFromFetchRequest( |
53 const ServiceWorkerFetchRequest& request, | 54 const ServiceWorkerFetchRequest& request, |
54 blink::WebServiceWorkerRequest* web_request) { | 55 blink::WebServiceWorkerRequest* web_request) { |
55 web_request->setURL(request.url); | 56 web_request->setURL(request.url); |
56 web_request->setMethod(base::ASCIIToUTF16(request.method)); | 57 web_request->setMethod(base::ASCIIToUTF16(request.method)); |
57 for (ServiceWorkerHeaderMap::const_iterator i = request.headers.begin(), | 58 for (ServiceWorkerHeaderMap::const_iterator i = request.headers.begin(), |
(...skipping 17 matching lines...) Expand all Loading... |
75 } | 76 } |
76 | 77 |
77 ServiceWorkerResponse ResponseFromWebResponse( | 78 ServiceWorkerResponse ResponseFromWebResponse( |
78 const blink::WebServiceWorkerResponse& web_response) { | 79 const blink::WebServiceWorkerResponse& web_response) { |
79 ServiceWorkerHeaderMap headers; | 80 ServiceWorkerHeaderMap headers; |
80 GetServiceWorkerHeaderMapFromWebResponse(web_response, &headers); | 81 GetServiceWorkerHeaderMapFromWebResponse(web_response, &headers); |
81 // We don't support streaming for cache. | 82 // We don't support streaming for cache. |
82 DCHECK(web_response.streamURL().isEmpty()); | 83 DCHECK(web_response.streamURL().isEmpty()); |
83 return ServiceWorkerResponse( | 84 return ServiceWorkerResponse( |
84 web_response.url(), web_response.status(), | 85 web_response.url(), web_response.status(), |
85 base::UTF16ToASCII(web_response.statusText()), | 86 base::UTF16ToASCII(base::StringPiece16(web_response.statusText())), |
86 web_response.responseType(), headers, | 87 web_response.responseType(), headers, |
87 base::UTF16ToASCII(web_response.blobUUID()), web_response.blobSize(), | 88 base::UTF16ToASCII(base::StringPiece16(web_response.blobUUID())), |
88 web_response.streamURL(), blink::WebServiceWorkerResponseErrorUnknown); | 89 web_response.blobSize(), web_response.streamURL(), |
| 90 blink::WebServiceWorkerResponseErrorUnknown); |
89 } | 91 } |
90 | 92 |
91 CacheStorageCacheQueryParams QueryParamsFromWebQueryParams( | 93 CacheStorageCacheQueryParams QueryParamsFromWebQueryParams( |
92 const blink::WebServiceWorkerCache::QueryParams& web_query_params) { | 94 const blink::WebServiceWorkerCache::QueryParams& web_query_params) { |
93 CacheStorageCacheQueryParams query_params; | 95 CacheStorageCacheQueryParams query_params; |
94 query_params.ignore_search = web_query_params.ignoreSearch; | 96 query_params.ignore_search = web_query_params.ignoreSearch; |
95 query_params.ignore_method = web_query_params.ignoreMethod; | 97 query_params.ignore_method = web_query_params.ignoreMethod; |
96 query_params.ignore_vary = web_query_params.ignoreVary; | 98 query_params.ignore_vary = web_query_params.ignoreVary; |
97 query_params.cache_name = web_query_params.cacheName; | 99 query_params.cache_name = web_query_params.cacheName; |
98 return query_params; | 100 return query_params; |
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
665 CacheStorageDispatcher::WebResponsesFromResponses( | 667 CacheStorageDispatcher::WebResponsesFromResponses( |
666 const std::vector<ServiceWorkerResponse>& responses) { | 668 const std::vector<ServiceWorkerResponse>& responses) { |
667 blink::WebVector<blink::WebServiceWorkerResponse> web_responses( | 669 blink::WebVector<blink::WebServiceWorkerResponse> web_responses( |
668 responses.size()); | 670 responses.size()); |
669 for (size_t i = 0; i < responses.size(); ++i) | 671 for (size_t i = 0; i < responses.size(); ++i) |
670 PopulateWebResponseFromResponse(responses[i], &(web_responses[i])); | 672 PopulateWebResponseFromResponse(responses[i], &(web_responses[i])); |
671 return web_responses; | 673 return web_responses; |
672 } | 674 } |
673 | 675 |
674 } // namespace content | 676 } // namespace content |
OLD | NEW |