third_party/WebKit/Source/core/frame/csp/CSPSourceList.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/CSPSourceList.cpp

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

Patch Set: 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

« third_party/WebKit/Source/core/frame/csp/CSPSource.cpp ('K') | « third_party/WebKit/Source/core/frame/csp/CSPSourceList.h ('k') | third_party/WebKit/Source/core/frame/csp/CSPSourceListTest.cpp » ('j') | third_party/WebKit/Source/core/frame/csp/SourceListDirective.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f9915535caf4d7fd4bd50b327af9e46aeef4f2fd..d4c577c008ef9e39d009b4e304fec68313e2182d 100644

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

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

@@ -44,7 +44,7 @@ CSPSourceList::CSPSourceList(ContentSecurityPolicy* policy, const String& direct

{

}

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

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

{

// The CSP spec specifically states that data:, blob:, and filesystem URLs

// should not be captured by a '*" source

@@ -524,7 +524,7 @@ void CSPSourceList::addSourceHash(const ContentSecurityPolicyHashAlgorithm& algo

m_hashAlgorithmsUsed |= algorithm;

}

-bool CSPSourceList::hasSourceMatchInList(const KURL& url, ContentSecurityPolicy::RedirectStatus redirectStatus) const

+bool CSPSourceList::hasSourceMatchInList(const KURL& url, ResourceRequest::RedirectStatus redirectStatus) const

{

for (size_t i = 0; i < m_list.size(); ++i) {

if (m_list[i]->matches(url, redirectStatus))