diff options
Diffstat (limited to 'Source/WebCore/page/ContentSecurityPolicy.h')
-rw-r--r-- | Source/WebCore/page/ContentSecurityPolicy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/page/ContentSecurityPolicy.h b/Source/WebCore/page/ContentSecurityPolicy.h index 39e049e10..0f87dfc3f 100644 --- a/Source/WebCore/page/ContentSecurityPolicy.h +++ b/Source/WebCore/page/ContentSecurityPolicy.h @@ -27,6 +27,7 @@ #define ContentSecurityPolicy_h #include "KURL.h" +#include "ScriptState.h" #include <wtf/PassOwnPtr.h> #include <wtf/RefCounted.h> #include <wtf/Vector.h> @@ -40,7 +41,6 @@ class OrdinalNumber; namespace WebCore { class CSPDirectiveList; -class ScriptCallStack; class DOMStringList; class ScriptExecutionContext; class SecurityOrigin; @@ -80,7 +80,7 @@ public: bool allowInlineEventHandlers(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const; bool allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const; bool allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const; - bool allowEval(PassRefPtr<ScriptCallStack>, ReportingStatus = SendReport) const; + bool allowEval(ScriptState* = 0, ReportingStatus = SendReport) const; bool allowScriptNonce(const String& nonce, const String& contextURL, const WTF::OrdinalNumber& contextLine, const KURL& = KURL()) const; bool allowPluginType(const String& type, const String& typeAttribute, const KURL&, ReportingStatus = SendReport) const; @@ -106,7 +106,7 @@ public: void reportInvalidPluginTypes(const String&) const; void reportInvalidSourceExpression(const String& directiveName, const String& source) const; void reportUnrecognizedDirective(const String&) const; - void reportViolation(const String& directiveText, const String& consoleMessage, const KURL& blockedURL, const Vector<KURL>& reportURIs, const String& header, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), PassRefPtr<ScriptCallStack> = 0) const; + void reportViolation(const String& directiveText, const String& consoleMessage, const KURL& blockedURL, const Vector<KURL>& reportURIs, const String& header, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), ScriptState* = 0) const; void reportBlockedScriptExecutionToInspector(const String& directiveText) const; @@ -119,7 +119,7 @@ public: private: explicit ContentSecurityPolicy(ScriptExecutionContext*); - void logToConsole(const String& message, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), PassRefPtr<ScriptCallStack> = 0) const; + void logToConsole(const String& message, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), ScriptState* = 0) const; ScriptExecutionContext* m_scriptExecutionContext; bool m_overrideInlineStyleAllowed; |