Changeset 38440 in webkit for trunk/JavaScriptCore/runtime/JSGlobalObject.h
- Timestamp:
- Nov 15, 2008, 8:40:06 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/runtime/JSGlobalObject.h
r37938 r38440 115 115 RegExpPrototype* regExpPrototype; 116 116 117 RefPtr<Structure ID> argumentsStructure;118 RefPtr<Structure ID> arrayStructure;119 RefPtr<Structure ID> booleanObjectStructure;120 RefPtr<Structure ID> callbackConstructorStructure;121 RefPtr<Structure ID> callbackFunctionStructure;122 RefPtr<Structure ID> callbackObjectStructure;123 RefPtr<Structure ID> dateStructure;124 RefPtr<Structure ID> emptyObjectStructure;125 RefPtr<Structure ID> errorStructure;126 RefPtr<Structure ID> functionStructure;127 RefPtr<Structure ID> numberObjectStructure;128 RefPtr<Structure ID> prototypeFunctionStructure;129 RefPtr<Structure ID> regExpMatchesArrayStructure;130 RefPtr<Structure ID> regExpStructure;131 RefPtr<Structure ID> stringObjectStructure;117 RefPtr<Structure> argumentsStructure; 118 RefPtr<Structure> arrayStructure; 119 RefPtr<Structure> booleanObjectStructure; 120 RefPtr<Structure> callbackConstructorStructure; 121 RefPtr<Structure> callbackFunctionStructure; 122 RefPtr<Structure> callbackObjectStructure; 123 RefPtr<Structure> dateStructure; 124 RefPtr<Structure> emptyObjectStructure; 125 RefPtr<Structure> errorStructure; 126 RefPtr<Structure> functionStructure; 127 RefPtr<Structure> numberObjectStructure; 128 RefPtr<Structure> prototypeFunctionStructure; 129 RefPtr<Structure> regExpMatchesArrayStructure; 130 RefPtr<Structure> regExpStructure; 131 RefPtr<Structure> stringObjectStructure; 132 132 133 133 SymbolTable symbolTable; … … 143 143 144 144 explicit JSGlobalObject() 145 : JSVariableObject(JSGlobalObject::createStructure ID(jsNull()), new JSGlobalObjectData)145 : JSVariableObject(JSGlobalObject::createStructure(jsNull()), new JSGlobalObjectData) 146 146 { 147 147 init(this); … … 149 149 150 150 protected: 151 JSGlobalObject(PassRefPtr<Structure ID> structure, JSGlobalObjectData* data, JSObject* thisValue)151 JSGlobalObject(PassRefPtr<Structure> structure, JSGlobalObjectData* data, JSObject* thisValue) 152 152 : JSVariableObject(structure, data) 153 153 { … … 197 197 RegExpPrototype* regExpPrototype() const { return d()->regExpPrototype; } 198 198 199 Structure ID* argumentsStructure() const { return d()->argumentsStructure.get(); }200 Structure ID* arrayStructure() const { return d()->arrayStructure.get(); }201 Structure ID* booleanObjectStructure() const { return d()->booleanObjectStructure.get(); }202 Structure ID* callbackConstructorStructure() const { return d()->callbackConstructorStructure.get(); }203 Structure ID* callbackFunctionStructure() const { return d()->callbackFunctionStructure.get(); }204 Structure ID* callbackObjectStructure() const { return d()->callbackObjectStructure.get(); }205 Structure ID* dateStructure() const { return d()->dateStructure.get(); }206 Structure ID* emptyObjectStructure() const { return d()->emptyObjectStructure.get(); }207 Structure ID* errorStructure() const { return d()->errorStructure.get(); }208 Structure ID* functionStructure() const { return d()->functionStructure.get(); }209 Structure ID* numberObjectStructure() const { return d()->numberObjectStructure.get(); }210 Structure ID* prototypeFunctionStructure() const { return d()->prototypeFunctionStructure.get(); }211 Structure ID* regExpMatchesArrayStructure() const { return d()->regExpMatchesArrayStructure.get(); }212 Structure ID* regExpStructure() const { return d()->regExpStructure.get(); }213 Structure ID* stringObjectStructure() const { return d()->stringObjectStructure.get(); }199 Structure* argumentsStructure() const { return d()->argumentsStructure.get(); } 200 Structure* arrayStructure() const { return d()->arrayStructure.get(); } 201 Structure* booleanObjectStructure() const { return d()->booleanObjectStructure.get(); } 202 Structure* callbackConstructorStructure() const { return d()->callbackConstructorStructure.get(); } 203 Structure* callbackFunctionStructure() const { return d()->callbackFunctionStructure.get(); } 204 Structure* callbackObjectStructure() const { return d()->callbackObjectStructure.get(); } 205 Structure* dateStructure() const { return d()->dateStructure.get(); } 206 Structure* emptyObjectStructure() const { return d()->emptyObjectStructure.get(); } 207 Structure* errorStructure() const { return d()->errorStructure.get(); } 208 Structure* functionStructure() const { return d()->functionStructure.get(); } 209 Structure* numberObjectStructure() const { return d()->numberObjectStructure.get(); } 210 Structure* prototypeFunctionStructure() const { return d()->prototypeFunctionStructure.get(); } 211 Structure* regExpMatchesArrayStructure() const { return d()->regExpMatchesArrayStructure.get(); } 212 Structure* regExpStructure() const { return d()->regExpStructure.get(); } 213 Structure* stringObjectStructure() const { return d()->stringObjectStructure.get(); } 214 214 215 215 void setProfileGroup(unsigned value) { d()->profileGroup = value; } … … 252 252 JSGlobalObjectData* d() const { return static_cast<JSGlobalObjectData*>(JSVariableObject::d); } 253 253 254 static PassRefPtr<Structure ID> createStructureID(JSValue* prototype)254 static PassRefPtr<Structure> createStructure(JSValue* prototype) 255 255 { 256 return Structure ID::create(prototype, TypeInfo(ObjectType));256 return Structure::create(prototype, TypeInfo(ObjectType)); 257 257 } 258 258 … … 336 336 } 337 337 338 inline JSValue* Structure ID::prototypeForLookup(ExecState* exec)338 inline JSValue* Structure::prototypeForLookup(ExecState* exec) 339 339 { 340 340 if (typeInfo().type() == ObjectType)
Note:
See TracChangeset
for help on using the changeset viewer.