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/JavaScriptCore/runtime/ScopeChain.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/JavaScriptCore/runtime/ScopeChain.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/ScopeChain.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/runtime/ScopeChain.h b/Source/JavaScriptCore/runtime/ScopeChain.h index b104e75..11f3692 100644 --- a/Source/JavaScriptCore/runtime/ScopeChain.h +++ b/Source/JavaScriptCore/runtime/ScopeChain.h @@ -21,6 +21,7 @@ #ifndef ScopeChain_h #define ScopeChain_h +#include "WriteBarrier.h" #include <wtf/FastAllocBase.h> namespace JSC { @@ -52,7 +53,6 @@ namespace JSC { ~ScopeChainNode() { next = 0; - object = 0; globalData = 0; globalObject = 0; globalThis = 0; @@ -60,7 +60,7 @@ namespace JSC { #endif ScopeChainNode* next; - JSObject* object; + DeprecatedPtr<JSObject> object; JSGlobalData* globalData; JSGlobalObject* globalObject; JSObject* globalThis; @@ -131,8 +131,8 @@ namespace JSC { { } - JSObject* const & operator*() const { return m_node->object; } - JSObject* const * operator->() const { return &(operator*()); } + DeprecatedPtr<JSObject> const & operator*() const { return m_node->object; } + DeprecatedPtr<JSObject> const * operator->() const { return &(operator*()); } ScopeChainIterator& operator++() { m_node = m_node->next; return *this; } @@ -195,7 +195,7 @@ namespace JSC { ScopeChainNode* node() const { return m_node; } - JSObject* top() const { return m_node->object; } + JSObject* top() const { return m_node->object.get(); } ScopeChainIterator begin() const { return m_node->begin(); } ScopeChainIterator end() const { return m_node->end(); } |