Index: third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h |
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h |
index 51ab571882a0465373623897c3833e542941dbc1..b305e5b816001596b461bfa223679f74d6d976da 100644 |
--- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h |
+++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h |
@@ -190,17 +190,17 @@ |
SourceListDirective* operativeDirective(SourceListDirective*, |
SourceListDirective* override) const; |
void reportViolation(const String& directiveText, |
- const ContentSecurityPolicy::DirectiveType&, |
+ const String& effectiveDirective, |
const String& consoleMessage, |
const KURL& blockedURL, |
ResourceRequest::RedirectStatus) const; |
void reportViolationWithFrame(const String& directiveText, |
- const ContentSecurityPolicy::DirectiveType&, |
+ const String& effectiveDirective, |
const String& consoleMessage, |
const KURL& blockedURL, |
LocalFrame*) const; |
void reportViolationWithLocation(const String& directiveText, |
- const ContentSecurityPolicy::DirectiveType&, |
+ const String& effectiveDirective, |
const String& consoleMessage, |
const KURL& blockedURL, |
const String& contextURL, |
@@ -208,7 +208,7 @@ |
Element*) const; |
void reportViolationWithState( |
const String& directiveText, |
- const ContentSecurityPolicy::DirectiveType&, |
+ const String& effectiveDirective, |
const String& message, |
const KURL& blockedURL, |
ScriptState*, |
@@ -247,11 +247,10 @@ |
bool isScript, |
const String& hashValue) const; |
- bool checkSourceAndReportViolation( |
- SourceListDirective*, |
- const KURL&, |
- const ContentSecurityPolicy::DirectiveType&, |
- ResourceRequest::RedirectStatus) const; |
+ bool checkSourceAndReportViolation(SourceListDirective*, |
+ const KURL&, |
+ const String& effectiveDirective, |
+ ResourceRequest::RedirectStatus) const; |
bool checkMediaTypeAndReportViolation(MediaListDirective*, |
const String& type, |
const String& typeAttribute, |