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

Unified Diff: Source/core/loader/CrossOriginPreflightResultCache.cpp

Issue 379113002: Move fetch-related predicates to core/fetch. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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: Source/core/loader/CrossOriginPreflightResultCache.cpp
diff --git a/Source/core/loader/CrossOriginPreflightResultCache.cpp b/Source/core/loader/CrossOriginPreflightResultCache.cpp
index 016c95373c585502c9e955a95877858900936085..ff73bb58e415803a2b5f43a04c22ce97815244f1 100644
--- a/Source/core/loader/CrossOriginPreflightResultCache.cpp
+++ b/Source/core/loader/CrossOriginPreflightResultCache.cpp
@@ -27,7 +27,7 @@
#include "config.h"
#include "core/loader/CrossOriginPreflightResultCache.h"
-#include "core/fetch/CrossOriginAccessControl.h"
+#include "core/fetch/FetchUtils.h"
#include "platform/network/ResourceResponse.h"
#include "wtf/CurrentTime.h"
#include "wtf/MainThread.h"
@@ -103,8 +103,9 @@ bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response
if (parseAccessControlMaxAge(response.httpHeaderField("Access-Control-Max-Age"), expiryDelta)) {
if (expiryDelta > maxPreflightCacheTimeoutSeconds)
expiryDelta = maxPreflightCacheTimeoutSeconds;
- } else
+ } else {
expiryDelta = defaultPreflightCacheTimeoutSeconds;
+ }
m_absoluteExpiryTime = currentTime() + expiryDelta;
return true;
@@ -112,7 +113,7 @@ bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response
bool CrossOriginPreflightResultCacheItem::allowsCrossOriginMethod(const String& method, String& errorDescription) const
{
- if (m_methods.contains(method) || isOnAccessControlSimpleRequestMethodWhitelist(method))
+ if (m_methods.contains(method) || FetchUtils::isSimpleMethod(method))
return true;
errorDescription = "Method " + method + " is not allowed by Access-Control-Allow-Methods.";
@@ -123,7 +124,7 @@ bool CrossOriginPreflightResultCacheItem::allowsCrossOriginHeaders(const HTTPHea
{
HTTPHeaderMap::const_iterator end = requestHeaders.end();
for (HTTPHeaderMap::const_iterator it = requestHeaders.begin(); it != end; ++it) {
- if (!m_headers.contains(it->key) && !isOnAccessControlSimpleRequestHeaderWhitelist(it->key, it->value)) {
+ if (!m_headers.contains(it->key) && !FetchUtils::isSimpleHeader(it->key, it->value)) {
errorDescription = "Request header field " + it->key.string() + " is not allowed by Access-Control-Allow-Headers.";
return false;
}

Powered by Google App Engine
This is Rietveld 408576698