diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/dom/ScriptExecutionContext.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/dom/ScriptExecutionContext.h')
-rw-r--r-- | Source/WebCore/dom/ScriptExecutionContext.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebCore/dom/ScriptExecutionContext.h b/Source/WebCore/dom/ScriptExecutionContext.h index b57b75a..642906c 100644 --- a/Source/WebCore/dom/ScriptExecutionContext.h +++ b/Source/WebCore/dom/ScriptExecutionContext.h @@ -60,6 +60,7 @@ namespace WebCore { class FileThread; #endif class MessagePort; + class DOMURL; class SecurityOrigin; class ScriptCallStack; @@ -90,6 +91,7 @@ namespace WebCore { SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); } + bool sanitizeScriptError(String& errorMessage, int& lineNumber, String& sourceURL); void reportException(const String& errorMessage, int lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>); virtual void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>) = 0; @@ -112,6 +114,11 @@ namespace WebCore { void destroyedMessagePort(MessagePort*); const HashSet<MessagePort*>& messagePorts() const { return m_messagePorts; } +#if ENABLE(BLOB) + void createdDomUrl(DOMURL*); + void destroyedDomUrl(DOMURL*); + const HashSet<DOMURL*>& domUrls() const { return m_domUrls; } +#endif void ref() { refScriptExecutionContext(); } void deref() { derefScriptExecutionContext(); } @@ -166,11 +173,14 @@ namespace WebCore { HashSet<MessagePort*> m_messagePorts; HashMap<ActiveDOMObject*, void*> m_activeDOMObjects; + bool m_iteratingActiveDOMObjects; + bool m_inDestructor; HashMap<int, DOMTimer*> m_timeouts; #if ENABLE(BLOB) HashSet<String> m_publicBlobURLs; + HashSet<DOMURL*> m_domUrls; #endif virtual void refScriptExecutionContext() = 0; |