third_party/WebKit/Source/core/frame/csp/CSPSource.cpp - Issue 2025633002: Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

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/frame/csp/CSPSource.cpp

Issue 2025633002: Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: foolip@ Created 4 years, 7 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/frame/csp/CSPSource.h ('k') | third_party/WebKit/Source/core/frame/csp/CSPSourceList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/csp/CSPSource.cpp

diff --git a/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp b/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp

index f8e597bc6ecb54b399ba6a67b8065eef391da0e4..34f11635dff20c2d7761f64769517a40a16ae0ba 100644

--- a/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp

+++ b/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp

@@ -24,13 +24,13 @@ CSPSource::CSPSource(ContentSecurityPolicy* policy, const String& scheme, const

{

}

-bool CSPSource::matches(const KURL& url, ContentSecurityPolicy::RedirectStatus redirectStatus) const

+bool CSPSource::matches(const KURL& url, ResourceRequest::RedirectStatus redirectStatus) const

{

if (!schemeMatches(url))

return false;

if (isSchemeOnly())

return true;

- bool pathsMatch = (redirectStatus == ContentSecurityPolicy::DidRedirect) || pathMatches(url);

+ bool pathsMatch = (redirectStatus == RedirectStatus::FollowedRedirect) || pathMatches(url);

return hostMatches(url) && portMatches(url) && pathsMatch;

}

« no previous file with comments | « third_party/WebKit/Source/core/frame/csp/CSPSource.h ('k') | third_party/WebKit/Source/core/frame/csp/CSPSourceList.h » ('j') | no next file with comments »