| Index: third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
|
| index dcb529296169cb0aac624519db4d5bcd08dbd2a4..77f5867bb4ae7d7a6c439f0a60173162f53ddc14 100644
|
| --- a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
|
| @@ -43,24 +43,16 @@
|
|
|
| namespace blink {
|
|
|
| -static std::unique_ptr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet()
|
| -{
|
| - std::unique_ptr<HTTPHeaderSet> headerSet = wrapUnique(new HashSet<String, CaseFoldingHash>);
|
| -
|
| - headerSet->add("cache-control");
|
| - headerSet->add("content-language");
|
| - headerSet->add("content-type");
|
| - headerSet->add("expires");
|
| - headerSet->add("last-modified");
|
| - headerSet->add("pragma");
|
| -
|
| - return headerSet;
|
| -}
|
| -
|
| bool isOnAccessControlResponseHeaderWhitelist(const String& name)
|
| {
|
| - DEFINE_THREAD_SAFE_STATIC_LOCAL(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().release()));
|
| -
|
| + DEFINE_THREAD_SAFE_STATIC_LOCAL(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (new HTTPHeaderSet({
|
| + "cache-control",
|
| + "content-language",
|
| + "content-type",
|
| + "expires",
|
| + "last-modified",
|
| + "pragma",
|
| + })));
|
| return allowedCrossOriginResponseHeaders.contains(name);
|
| }
|
|
|
|
|