Index: Source/core/dom/ScriptExecutionContext.h |
diff --git a/Source/core/dom/ScriptExecutionContext.h b/Source/core/dom/ScriptExecutionContext.h |
index fcbd20848683f9cfa48aa6837ee68ccfe90f2bc7..131f26de24ee2cc1fce9f7d89f7d0ef3fc64e65a 100644 |
--- a/Source/core/dom/ScriptExecutionContext.h |
+++ b/Source/core/dom/ScriptExecutionContext.h |
@@ -30,6 +30,7 @@ |
#include "core/dom/ActiveDOMObject.h" |
#include "core/dom/SecurityContext.h" |
+#include "core/loader/CrossOriginAccessControl.h" |
#include "core/page/ConsoleTypes.h" |
#include "core/page/DOMTimer.h" |
#include "core/platform/LifecycleContext.h" |
@@ -68,8 +69,8 @@ public: |
virtual void disableEval(const String& errorMessage) = 0; |
- bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL); |
- void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>); |
+ bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL, ScriptAccessControlCheckStatus = ScriptIsNotSharedCrossOrigin); |
+ void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>, ScriptAccessControlCheckStatus = ScriptIsNotSharedCrossOrigin); |
void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState* = 0, unsigned long requestIdentifier = 0); |
virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) = 0; |
@@ -156,7 +157,7 @@ private: |
virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) = 0; |
virtual EventTarget* errorEventTarget() = 0; |
virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) = 0; |
- bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL); |
+ bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, ScriptAccessControlCheckStatus = ScriptIsNotSharedCrossOrigin); |
void closeMessagePorts(); |