diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/frame/csp/content_security_policy.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/frame/csp/content_security_policy.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/chromium/third_party/blink/renderer/core/frame/csp/content_security_policy.h b/chromium/third_party/blink/renderer/core/frame/csp/content_security_policy.h index 29fe4bae016..f18fc9a763d 100644 --- a/chromium/third_party/blink/renderer/core/frame/csp/content_security_policy.h +++ b/chromium/third_party/blink/renderer/core/frame/csp/content_security_policy.h @@ -181,7 +181,6 @@ class CORE_EXPORT ContentSecurityPolicy final kPrefetchSrc, kReportTo, kReportURI, - kRequireSRIFor, kTrustedTypes, kSandbox, kScriptSrc, @@ -214,7 +213,7 @@ class CORE_EXPORT ContentSecurityPolicy final ContentSecurityPolicy(); ~ContentSecurityPolicy(); - void Trace(Visitor*); + void Trace(Visitor*) const; bool IsBound(); void BindToDelegate(ContentSecurityPolicyDelegate&); @@ -271,13 +270,15 @@ class CORE_EXPORT ContentSecurityPolicy final bool AllowBaseURI(const KURL&) const; bool AllowConnectToSource( const KURL&, - RedirectStatus = RedirectStatus::kNoRedirect, + const KURL& url_before_redirects, + RedirectStatus, ReportingDisposition = ReportingDisposition::kReport, CheckHeaderType = CheckHeaderType::kCheckAll) const; bool AllowFormAction(const KURL&) const; bool AllowImageFromSource( const KURL&, - RedirectStatus = RedirectStatus::kNoRedirect, + const KURL& url_before_redirects, + RedirectStatus, ReportingDisposition = ReportingDisposition::kReport, CheckHeaderType = CheckHeaderType::kCheckAll) const; bool AllowMediaFromSource(const KURL&) const; @@ -287,7 +288,8 @@ class CORE_EXPORT ContentSecurityPolicy final const String& nonce, const IntegrityMetadataSet&, ParserDisposition, - RedirectStatus = RedirectStatus::kNoRedirect, + const KURL& url_before_redirects, + RedirectStatus, ReportingDisposition = ReportingDisposition::kReport, CheckHeaderType = CheckHeaderType::kCheckAll) const; bool AllowWorkerContextFromSource(const KURL&) const; @@ -334,7 +336,8 @@ class CORE_EXPORT ContentSecurityPolicy final mojom::RequestContextType, network::mojom::RequestDestination, const KURL&, - RedirectStatus = RedirectStatus::kNoRedirect, + const KURL& url_before_redirects, + RedirectStatus, ReportingDisposition = ReportingDisposition::kReport, CheckHeaderType = CheckHeaderType::kCheckAll) const; @@ -346,7 +349,8 @@ class CORE_EXPORT ContentSecurityPolicy final const String& nonce, const IntegrityMetadataSet&, ParserDisposition, - RedirectStatus = RedirectStatus::kNoRedirect, + const KURL& url_before_redirects, + RedirectStatus, ReportingDisposition = ReportingDisposition::kReport, CheckHeaderType = CheckHeaderType::kCheckAll) const; @@ -380,7 +384,6 @@ class CORE_EXPORT ContentSecurityPolicy final const String& value, const char); void ReportInvalidPluginTypes(const String&); - void ReportInvalidRequireSRIForTokens(const String&); void ReportInvalidSandboxFlags(const String&); void ReportInvalidSourceExpression(const String& directive_name, const String& source); @@ -419,7 +422,7 @@ class CORE_EXPORT ContentSecurityPolicy final // Called when mixed content is detected on a page; will trigger a violation // report if the 'block-all-mixed-content' directive is specified for a // policy. - void ReportMixedContent(const KURL& mixed_url, RedirectStatus) const; + void ReportMixedContent(const KURL& blocked_url, RedirectStatus) const; void ReportBlockedScriptExecutionToInspector( const String& directive_text) const; @@ -546,7 +549,8 @@ class CORE_EXPORT ContentSecurityPolicy final bool AllowFromSource(ContentSecurityPolicy::DirectiveType, const KURL&, - RedirectStatus = RedirectStatus::kNoRedirect, + const KURL& url_before_redirects, + RedirectStatus, ReportingDisposition = ReportingDisposition::kReport, CheckHeaderType = CheckHeaderType::kCheckAll, const String& = String(), |