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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

Issue 2415373002: Loading: bulk style errors fix in core/loader (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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/FormSubmission.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
index b98a47d5d7b4b8a63946e9f1ee0907c199c44183..e67286f588b826025ee583dda7efd26417d4e8f1 100644
--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
@@ -247,11 +247,12 @@ void DocumentThreadableLoader::start(const ResourceRequest& request) {
WebURLRequest::FetchRequestModeSameOrigin);
break;
case UseAccessControl:
- if (m_options.preflightPolicy == ForcePreflight)
+ if (m_options.preflightPolicy == ForcePreflight) {
newRequest.setFetchRequestMode(
WebURLRequest::FetchRequestModeCORSWithForcedPreflight);
- else
+ } else {
newRequest.setFetchRequestMode(WebURLRequest::FetchRequestModeCORS);
+ }
break;
case AllowCrossOriginRequests:
SECURITY_CHECK(IsNoCORSAllowedContext(m_requestContext,
@@ -259,12 +260,13 @@ void DocumentThreadableLoader::start(const ResourceRequest& request) {
newRequest.setFetchRequestMode(WebURLRequest::FetchRequestModeNoCORS);
break;
}
- if (m_resourceLoaderOptions.allowCredentials == AllowStoredCredentials)
+ if (m_resourceLoaderOptions.allowCredentials == AllowStoredCredentials) {
newRequest.setFetchCredentialsMode(
WebURLRequest::FetchCredentialsModeInclude);
- else
+ } else {
newRequest.setFetchCredentialsMode(
WebURLRequest::FetchCredentialsModeSameOrigin);
+ }
}
// We assume that ServiceWorker is skipped for sync requests and unsupported
@@ -541,9 +543,10 @@ bool DocumentThreadableLoader::redirectReceived(
// Allow same origin requests to continue after allowing clients to audit the
// redirect.
if (isAllowedRedirect(request.url())) {
- if (m_client->isDocumentThreadableLoaderClient())
+ if (m_client->isDocumentThreadableLoaderClient()) {
return static_cast<DocumentThreadableLoaderClient*>(m_client)
->willFollowRedirect(request, redirectResponse);
+ }
return true;
}
@@ -986,9 +989,10 @@ void DocumentThreadableLoader::loadRequest(
if (!m_actualRequest.isNull())
resourceLoaderOptions.dataBufferingPolicy = BufferData;
- if (m_options.timeoutMilliseconds > 0)
+ if (m_options.timeoutMilliseconds > 0) {
m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0,
BLINK_FROM_HERE);
+ }
FetchRequest newRequest(request, m_options.initiator,
resourceLoaderOptions);
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/FormSubmission.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698