Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1324)

Unified Diff: content/renderer/cache_storage/cache_storage_dispatcher.cc

Issue 1965013002: Implement headers attributes in ForeignFetchResponse (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: using instead of typedef Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/cache_storage/cache_storage_dispatcher.cc
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc
index 5bc3521dea15df34f12438c5d5ede9f633bcb107..a490e4c69b583df306ca1a6e00a3ce61de38c25c 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.cc
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
@@ -82,6 +82,9 @@ ServiceWorkerResponse ResponseFromWebResponse(
const blink::WebServiceWorkerResponse& web_response) {
ServiceWorkerHeaderMap headers;
GetServiceWorkerHeaderMapFromWebResponse(web_response, &headers);
+ ServiceWorkerHeaderList cors_exposed_header_names;
+ GetCorsExposedHeaderNamesFromWebResponse(web_response,
+ &cors_exposed_header_names);
// We don't support streaming for cache.
DCHECK(web_response.streamURL().isEmpty());
return ServiceWorkerResponse(
@@ -93,7 +96,7 @@ ServiceWorkerResponse ResponseFromWebResponse(
blink::WebServiceWorkerResponseErrorUnknown,
base::Time::FromInternalValue(web_response.responseTime()),
!web_response.cacheStorageCacheName().isNull(),
- web_response.cacheStorageCacheName().utf8());
+ web_response.cacheStorageCacheName().utf8(), cors_exposed_header_names);
}
CacheStorageCacheQueryParams QueryParamsFromWebQueryParams(
@@ -655,6 +658,13 @@ void CacheStorageDispatcher::PopulateWebResponseFromResponse(
response.is_in_cache_storage
? blink::WebString::fromUTF8(response.cache_storage_cache_name)
: blink::WebString());
+ blink::WebVector<blink::WebString> headers(
+ response.cors_exposed_header_names.size());
+ std::transform(
+ response.cors_exposed_header_names.begin(),
+ response.cors_exposed_header_names.end(), headers.begin(),
+ [](const std::string& h) { return blink::WebString::fromLatin1(h); });
+ web_response->setCorsExposedHeaderNames(headers);
for (const auto& i : response.headers) {
web_response->setHeader(base::ASCIIToUTF16(i.first),
« no previous file with comments | « content/public/common/resource_response_info.h ('k') | content/renderer/service_worker/service_worker_context_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698