| 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 272e3f59705350a24044390fa94da92741040c4b..0666500f04cb0686617ebb392b128b5cfda3fe89 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
|
| @@ -60,6 +60,7 @@ class FrameLoaderClient;
|
| class KURL;
|
| class ResourceRequest;
|
| class SecurityOrigin;
|
| +class SourceLocation;
|
|
|
| typedef int SandboxFlags;
|
| typedef HeapVector<Member<CSPDirectiveList>> CSPDirectiveListVector;
|
| @@ -216,7 +217,7 @@ public:
|
|
|
| // If a frame is passed in, the message will be logged to its active document's console.
|
| // Otherwise, the message will be logged to this object's |m_executionContext|.
|
| - void logToConsole(ConsoleMessage*, LocalFrame* = nullptr);
|
| + void logToConsole(const String& message, MessageLevel = ErrorMessageLevel, PassOwnPtr<SourceLocation> = nullptr, LocalFrame* = nullptr);
|
|
|
| void reportDirectiveAsSourceExpression(const String& directiveName, const String& sourceExpression);
|
| void reportDuplicateDirective(const String&);
|
| @@ -276,8 +277,6 @@ private:
|
|
|
| KURL completeURL(const String&) const;
|
|
|
| - void logToConsole(const String& message, MessageLevel = ErrorMessageLevel);
|
| -
|
| void addAndReportPolicyFromHeaderValue(const String&, ContentSecurityPolicyHeaderType, ContentSecurityPolicyHeaderSource);
|
|
|
| bool shouldSendViolationReport(const String&) const;
|
|
|