| Index: Source/core/page/ContentSecurityPolicy.h
|
| diff --git a/Source/core/page/ContentSecurityPolicy.h b/Source/core/page/ContentSecurityPolicy.h
|
| index aa76d5e729e7dc46b12b0b8f3fa57820f069c945..9b82bf0f4266e3779d17f47a5b6815f561e911c7 100644
|
| --- a/Source/core/page/ContentSecurityPolicy.h
|
| +++ b/Source/core/page/ContentSecurityPolicy.h
|
| @@ -89,13 +89,12 @@ public:
|
|
|
| bool allowJavaScriptURLs(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;
|
| 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 allowInlineScript(bool validNonce, const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;
|
| bool allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, 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;
|
|
|
| - bool allowScriptFromSource(const KURL&, ReportingStatus = SendReport) const;
|
| + bool allowScriptFromSource(const KURL&, bool validNonce, ReportingStatus = SendReport) const;
|
| bool allowObjectFromSource(const KURL&, ReportingStatus = SendReport) const;
|
| bool allowChildFrameFromSource(const KURL&, ReportingStatus = SendReport) const;
|
| bool allowImageFromSource(const KURL&, ReportingStatus = SendReport) const;
|
| @@ -105,6 +104,7 @@ public:
|
| bool allowConnectToSource(const KURL&, ReportingStatus = SendReport) const;
|
| bool allowFormAction(const KURL&, ReportingStatus = SendReport) const;
|
| bool allowBaseURI(const KURL&, ReportingStatus = SendReport) const;
|
| + bool allowNonce(const String& nonce) const;
|
|
|
| ReflectedXSSDisposition reflectedXSSDisposition() const;
|
|
|
|
|