| 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 f9e2466d95675d1a93b71e7a8f64bfc3863f3baa..037bb7ebd90cea0460562d7cd9e76dd4c178acf5 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| @@ -142,11 +142,13 @@ public:
|
| DECLARE_TRACE();
|
|
|
| void bindToExecutionContext(ExecutionContext*);
|
| + void setupSelf(const SecurityOrigin&);
|
| void copyStateFrom(const ContentSecurityPolicy*);
|
| void copyPluginTypesFrom(const ContentSecurityPolicy*);
|
|
|
| void didReceiveHeaders(const ContentSecurityPolicyResponseHeaders&);
|
| void didReceiveHeader(const String&, ContentSecurityPolicyHeaderType, ContentSecurityPolicyHeaderSource);
|
| + void replicateHeader(const String&, ContentSecurityPolicyHeaderType, ContentSecurityPolicyHeaderSource);
|
|
|
| PassOwnPtr<Vector<CSPHeaderAndType>> headers() const;
|
|
|
| @@ -271,11 +273,15 @@ private:
|
|
|
| void applyPolicySideEffectsToExecutionContext();
|
|
|
| - SecurityOrigin* getSecurityOrigin() const;
|
| KURL completeURL(const String&) const;
|
|
|
| void logToConsole(const String& message, MessageLevel = ErrorMessageLevel);
|
| - void addPolicyFromHeaderValue(const String&, ContentSecurityPolicyHeaderType, ContentSecurityPolicyHeaderSource);
|
| +
|
| + enum FrameLoaderClientNotificationAction {
|
| + NotifyFrameLoaderClient,
|
| + DontNotifyFrameLoaderClient,
|
| + };
|
| + void addPolicyFromHeaderValue(const String&, ContentSecurityPolicyHeaderType, ContentSecurityPolicyHeaderSource, FrameLoaderClientNotificationAction = NotifyFrameLoaderClient);
|
|
|
| bool shouldSendViolationReport(const String&) const;
|
| void didSendViolationReport(const String&);
|
|
|