Changeset 37845 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.cpp
- Timestamp:
- Oct 24, 2008, 9:22:51 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/kjs/JSGlobalObject.cpp
r37747 r37845 79 79 static const int preferredScriptCheckTimeInterval = 1000; 80 80 81 static inline void markIfNeeded(JSValue Ptrv)81 static inline void markIfNeeded(JSValue* v) 82 82 { 83 83 if (v && !v->marked()) … … 148 148 } 149 149 150 void JSGlobalObject::put(ExecState* exec, const Identifier& propertyName, JSValue Ptrvalue, PutPropertySlot& slot)150 void JSGlobalObject::put(ExecState* exec, const Identifier& propertyName, JSValue* value, PutPropertySlot& slot) 151 151 { 152 152 ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this)); … … 157 157 } 158 158 159 void JSGlobalObject::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValue Ptrvalue, unsigned attributes)159 void JSGlobalObject::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValue* value, unsigned attributes) 160 160 { 161 161 ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this)); … … 164 164 return; 165 165 166 JSValue PtrvalueBefore = getDirect(propertyName);166 JSValue* valueBefore = getDirect(propertyName); 167 167 PutPropertySlot slot; 168 168 JSVariableObject::put(exec, propertyName, value, slot); 169 169 if (!valueBefore) { 170 if (JSValue PtrvalueAfter = getDirect(propertyName))170 if (JSValue* valueAfter = getDirect(propertyName)) 171 171 putDirect(propertyName, valueAfter, attributes); 172 172 } … … 195 195 } 196 196 197 void JSGlobalObject::reset(JSValue Ptrprototype)197 void JSGlobalObject::reset(JSValue* prototype) 198 198 { 199 199 ExecState* exec = JSGlobalObject::globalExec(); … … 248 248 // Constructors 249 249 250 JSValue PtrobjectConstructor = new (exec) ObjectConstructor(exec, ObjectConstructor::createStructureID(d()->functionPrototype), d()->objectPrototype);251 JSValue PtrfunctionConstructor = new (exec) FunctionConstructor(exec, FunctionConstructor::createStructureID(d()->functionPrototype), d()->functionPrototype);252 JSValue PtrarrayConstructor = new (exec) ArrayConstructor(exec, ArrayConstructor::createStructureID(d()->functionPrototype), d()->arrayPrototype);253 JSValue PtrstringConstructor = new (exec) StringConstructor(exec, StringConstructor::createStructureID(d()->functionPrototype), d()->prototypeFunctionStructure.get(), d()->stringPrototype);254 JSValue PtrbooleanConstructor = new (exec) BooleanConstructor(exec, BooleanConstructor::createStructureID(d()->functionPrototype), d()->booleanPrototype);255 JSValue PtrnumberConstructor = new (exec) NumberConstructor(exec, NumberConstructor::createStructureID(d()->functionPrototype), d()->numberPrototype);256 JSValue PtrdateConstructor = new (exec) DateConstructor(exec, DateConstructor::createStructureID(d()->functionPrototype), d()->prototypeFunctionStructure.get(), d()->datePrototype);250 JSValue* objectConstructor = new (exec) ObjectConstructor(exec, ObjectConstructor::createStructureID(d()->functionPrototype), d()->objectPrototype); 251 JSValue* functionConstructor = new (exec) FunctionConstructor(exec, FunctionConstructor::createStructureID(d()->functionPrototype), d()->functionPrototype); 252 JSValue* arrayConstructor = new (exec) ArrayConstructor(exec, ArrayConstructor::createStructureID(d()->functionPrototype), d()->arrayPrototype); 253 JSValue* stringConstructor = new (exec) StringConstructor(exec, StringConstructor::createStructureID(d()->functionPrototype), d()->prototypeFunctionStructure.get(), d()->stringPrototype); 254 JSValue* booleanConstructor = new (exec) BooleanConstructor(exec, BooleanConstructor::createStructureID(d()->functionPrototype), d()->booleanPrototype); 255 JSValue* numberConstructor = new (exec) NumberConstructor(exec, NumberConstructor::createStructureID(d()->functionPrototype), d()->numberPrototype); 256 JSValue* dateConstructor = new (exec) DateConstructor(exec, DateConstructor::createStructureID(d()->functionPrototype), d()->prototypeFunctionStructure.get(), d()->datePrototype); 257 257 258 258 d()->regExpConstructor = new (exec) RegExpConstructor(exec, RegExpConstructor::createStructureID(d()->functionPrototype), d()->regExpPrototype); … … 338 338 339 339 // Set prototype, and also insert the object prototype at the end of the chain. 340 void JSGlobalObject::resetPrototype(JSValue Ptrprototype)340 void JSGlobalObject::resetPrototype(JSValue* prototype) 341 341 { 342 342 setPrototype(prototype);
Note:
See TracChangeset
for help on using the changeset viewer.