| Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| index bc89a13bca92a0070e7a806d2bf94b18f36abcb7..0536e7b4fb62a7dfd6d69d45f73aac83e25af79d 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| @@ -138,8 +138,8 @@ public:
|
| {
|
| return new ContentSecurityPolicy();
|
| }
|
| - ~ContentSecurityPolicy();
|
| - DECLARE_TRACE();
|
| + virtual ~ContentSecurityPolicy();
|
| + DECLARE_VIRTUAL_TRACE();
|
|
|
| void bindToExecutionContext(ExecutionContext*);
|
| void setupSelf(const SecurityOrigin&);
|
| @@ -250,7 +250,7 @@ public:
|
| // If a frame is passed in, the report will be sent using it as a context. If no frame is
|
| // passed in, the report will be sent via this object's |m_executionContext| (or dropped
|
| // on the floor if no such context is available).
|
| - void reportViolation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, const Vector<String>& reportEndpoints, const String& header, ViolationType, LocalFrame* = nullptr, RedirectStatus = RedirectStatus::FollowedRedirect, int contextLine = 0);
|
| + virtual void reportViolation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, const Vector<String>& reportEndpoints, const String& header, ViolationType, LocalFrame* = nullptr, RedirectStatus = RedirectStatus::FollowedRedirect, int contextLine = 0);
|
|
|
| // 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.
|
| @@ -282,13 +282,14 @@ public:
|
|
|
| Document* document() const;
|
|
|
| +protected:
|
| + ContentSecurityPolicy();
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(ContentSecurityPolicyTest, NonceInline);
|
| FRIEND_TEST_ALL_PREFIXES(ContentSecurityPolicyTest, NonceSinglePolicy);
|
| FRIEND_TEST_ALL_PREFIXES(ContentSecurityPolicyTest, NonceMultiplePolicy);
|
|
|
| - ContentSecurityPolicy();
|
| -
|
| void applyPolicySideEffectsToExecutionContext();
|
|
|
| KURL completeURL(const String&) const;
|
|
|