Changeset 48774 in webkit for trunk/JavaScriptCore/runtime/ScopeChain.h
- Timestamp:
- Sep 25, 2009, 3:26:44 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/runtime/ScopeChain.h
r47025 r48774 34 34 class ScopeChainNode : public FastAllocBase { 35 35 public: 36 ScopeChainNode(ScopeChainNode* next, JSObject* object, JSGlobalData* globalData, JS Object* globalThis)36 ScopeChainNode(ScopeChainNode* next, JSObject* object, JSGlobalData* globalData, JSGlobalObject* globalObject, JSObject* globalThis) 37 37 : next(next) 38 38 , object(object) 39 39 , globalData(globalData) 40 , globalObject(globalObject) 40 41 , globalThis(globalThis) 41 42 , refCount(1) 42 43 { 43 44 ASSERT(globalData); 45 ASSERT(globalObject); 44 46 } 45 47 #ifndef NDEBUG … … 52 54 object = 0; 53 55 globalData = 0; 56 globalObject = 0; 54 57 globalThis = 0; 55 58 } … … 59 62 JSObject* object; 60 63 JSGlobalData* globalData; 64 JSGlobalObject* globalObject; 61 65 JSObject* globalThis; 62 66 int refCount; … … 83 87 ScopeChainIterator end() const; 84 88 85 JSGlobalObject* globalObject() const; // defined in JSGlobalObject.h86 JSObject* globalThisObject() const { return globalThis; }87 88 89 #ifndef NDEBUG 89 90 void print() const; … … 94 95 { 95 96 ASSERT(o); 96 return new ScopeChainNode(this, o, globalData, global This);97 return new ScopeChainNode(this, o, globalData, globalObject, globalThis); 97 98 } 98 99 … … 164 165 } 165 166 166 ScopeChain(JSObject* o, JSGlobalData* globalData, JS Object* globalThis)167 : m_node(new ScopeChainNode(0, o, globalData, global This))167 ScopeChain(JSObject* o, JSGlobalData* globalData, JSGlobalObject* globalObject, JSObject* globalThis) 168 : m_node(new ScopeChainNode(0, o, globalData, globalObject, globalThis)) 168 169 { 169 170 } … … 204 205 void clear() { m_node->deref(); m_node = 0; } 205 206 206 JSGlobalObject* globalObject() const { return m_node->globalObject (); }207 JSGlobalObject* globalObject() const { return m_node->globalObject; } 207 208 208 209 void markAggregate(MarkStack&) const;
Note:
See TracChangeset
for help on using the changeset viewer.