Index: Source/core/dom/ScriptExecutionContext.h |
diff --git a/Source/core/dom/ScriptExecutionContext.h b/Source/core/dom/ScriptExecutionContext.h |
index 3ac45c67ce98daf29393a748ae6a106fb1285baa..48ce77dd9279eeecfa1706dca3c542792f93fbdb 100644 |
--- a/Source/core/dom/ScriptExecutionContext.h |
+++ b/Source/core/dom/ScriptExecutionContext.h |
@@ -69,8 +69,8 @@ public: |
virtual void disableEval(const String& errorMessage) = 0; |
- bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL, CachedScript* = 0); |
- void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>, CachedScript* = 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>); |
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; |
@@ -126,6 +126,9 @@ public: |
void setDatabaseContext(DatabaseContext*); |
+ void didLoadScriptThatPassedAccessControlCheck(const KURL&); |
+ bool scriptPassedAccessControlCheck(const KURL&) const; |
+ |
protected: |
class AddConsoleMessageTask : public Task { |
public: |
@@ -157,7 +160,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, CachedScript*); |
+ bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL); |
void closeMessagePorts(); |
@@ -171,6 +174,8 @@ private: |
HashSet<MessagePort*> m_messagePorts; |
+ HashSet<unsigned> m_scriptsPassingAccessControlCheck; |
+ |
int m_circularSequentialID; |
typedef HashMap<int, OwnPtr<DOMTimer> > TimeoutMap; |
TimeoutMap m_timeouts; |