third_party/WebKit/Source/core/fetch/ResourceLoader.cpp - Issue 1866433002: Use RequestContext to apply CSP in FrameFetchContext

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1866433002: Use RequestContext to apply CSP in FrameFetchContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rename redirectReceivedAndNotFollowed() to redirectBlocked() Created 4 years, 8 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 | « third_party/WebKit/Source/core/fetch/Resource.h ('k') | third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

index 38bba9600b1976ea731eace7bf934ba86e5c3c1f..87fbf79e39a24594ab398168acaaeefc982f2e98 100644

--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

@@ -215,10 +215,12 @@ void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewR

const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceResponse());

newRequest.setFollowedRedirect(true);

- if (m_fetcher->willFollowRedirect(m_resource.get(), newRequest, redirectResponse))

+ if (m_fetcher->willFollowRedirect(m_resource.get(), newRequest, redirectResponse)) {

m_resource->willFollowRedirect(newRequest, redirectResponse);

- else

+ } else {

+ m_resource->willNotFollowRedirect();

cancel(ResourceError::cancelledDueToAccessCheckError(newRequest.url()));

+ }

}

void ResourceLoader::didReceiveCachedMetadata(WebURLLoader*, const char* data, int length)