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

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.cpp ('k') | third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9dd3117e4f954aa284703d42edf3236ddb661db4..333d7f2f45183d506165e39477c9944f52708567 100644

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

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

@@ -10,6 +10,7 @@

#include "platform/Crypto.h"

#include "platform/heap/Handle.h"

#include "platform/network/ContentSecurityPolicyParsers.h"

+#include "platform/network/ResourceRequest.h"

#include "wtf/HashSet.h"

#include "wtf/text/WTFString.h"

@@ -27,7 +28,7 @@ public:

void parse(const UChar* begin, const UChar* end);

- bool matches(const KURL&, ContentSecurityPolicy::RedirectStatus = ContentSecurityPolicy::DidNotRedirect) const;

+ bool matches(const KURL&, ResourceRequest::RedirectStatus = ResourceRequest::RedirectStatus::NoRedirect) const;

bool allowInline() const;

bool allowEval() const;

bool allowDynamic() const;

@@ -56,7 +57,7 @@ private:

void addSourceNonce(const String& nonce);

void addSourceHash(const ContentSecurityPolicyHashAlgorithm&, const DigestValue& hash);

- bool hasSourceMatchInList(const KURL&, ContentSecurityPolicy::RedirectStatus) const;

+ bool hasSourceMatchInList(const KURL&, ResourceRequest::RedirectStatus) const;

Member<ContentSecurityPolicy> m_policy;

HeapVector<Member<CSPSource>> m_list;