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

Unified Diff: third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp

Issue 2417173002: Loading: bulk style errors fix in core/fetch (Closed)
Patch Set: Created 4 years, 2 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: 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 adf384456cbde047776266ec431a9c39fe6c78d2..4500489aea5d742132f18aa0e84e3c191b307a72 100644
--- a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
+++ b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
@@ -76,9 +76,10 @@ ResourceRequest createAccessControlPreflightRequest(
preflightRequest.setRequestContext(request.requestContext());
preflightRequest.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
- if (request.isExternalRequest())
+ if (request.isExternalRequest()) {
preflightRequest.setHTTPHeaderField(
HTTPNames::Access_Control_Request_External, "true");
+ }
const HTTPHeaderMap& requestHeaderFields = request.httpHeaderFields();
@@ -188,10 +189,11 @@ bool passesAccessControlCheck(const ResourceResponse& response,
"header when the credentials flag is true.",
securityOrigin);
- if (context == WebURLRequest::RequestContextXMLHttpRequest)
+ if (context == WebURLRequest::RequestContextXMLHttpRequest) {
errorDescription.append(
" The credentials mode of an XMLHttpRequest is controlled by the "
"withCredentials attribute.");
+ }
return false;
}
@@ -208,10 +210,11 @@ bool passesAccessControlCheck(const ResourceResponse& response,
errorDescription.append('.');
}
- if (context == WebURLRequest::RequestContextFetch)
+ if (context == WebURLRequest::RequestContextFetch) {
errorDescription.append(
" If an opaque response serves your needs, set the request's mode "
"to 'no-cors' to fetch the resource with CORS disabled.");
+ }
return false;
}
@@ -225,22 +228,24 @@ bool passesAccessControlCheck(const ResourceResponse& response,
allowOriginHeaderValue + "', but only one is allowed.";
} else {
KURL headerOrigin(KURL(), allowOriginHeaderValue);
- if (!headerOrigin.isValid())
+ if (!headerOrigin.isValid()) {
detail =
"The 'Access-Control-Allow-Origin' header contains the invalid "
"value '" +
allowOriginHeaderValue + "'.";
- else
+ } else {
detail = "The 'Access-Control-Allow-Origin' header has a value '" +
allowOriginHeaderValue +
"' that is not equal to the supplied origin.";
+ }
}
errorDescription = buildAccessControlFailureMessage(detail, securityOrigin);
- if (context == WebURLRequest::RequestContextFetch)
+ if (context == WebURLRequest::RequestContextFetch) {
errorDescription.append(
" Have the server send the header with a valid value, or, if an "
"opaque response serves your needs, set the request's mode to "
"'no-cors' to fetch the resource with CORS disabled.");
+ }
return false;
}

Powered by Google App Engine
This is Rietveld 408576698