Changeset 34607 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp
- Timestamp:
- Jun 16, 2008, 4:28:38 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/API/JSObjectRef.cpp
r34587 r34607 88 88 JSLock lock; 89 89 ExecState* exec = toJS(ctx); 90 Identifier nameID = name ? Identifier( toJS(name)) : Identifier("anonymous");90 Identifier nameID = name ? Identifier(exec, toJS(name)) : Identifier(exec, "anonymous"); 91 91 92 92 return toRef(new JSCallbackFunction(exec, callAsFunction, nameID)); … … 115 115 UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null; 116 116 117 Identifier nameID = name ? Identifier( toJS(name)) : Identifier("anonymous");117 Identifier nameID = name ? Identifier(exec, toJS(name)) : Identifier(exec, "anonymous"); 118 118 119 119 ArgList args; … … 153 153 UString::Rep* nameRep = toJS(propertyName); 154 154 155 return jsObject->hasProperty(exec, Identifier( nameRep));155 return jsObject->hasProperty(exec, Identifier(exec, nameRep)); 156 156 } 157 157 … … 163 163 UString::Rep* nameRep = toJS(propertyName); 164 164 165 JSValue* jsValue = jsObject->get(exec, Identifier( nameRep));165 JSValue* jsValue = jsObject->get(exec, Identifier(exec, nameRep)); 166 166 if (exec->hadException()) { 167 167 if (exception) … … 177 177 ExecState* exec = toJS(ctx); 178 178 JSObject* jsObject = toJS(object); 179 Identifier name( toJS(propertyName));179 Identifier name(exec, toJS(propertyName)); 180 180 JSValue* jsValue = toJS(value); 181 181 … … 230 230 UString::Rep* nameRep = toJS(propertyName); 231 231 232 bool result = jsObject->deleteProperty(exec, Identifier( nameRep));232 bool result = jsObject->deleteProperty(exec, Identifier(exec, nameRep)); 233 233 if (exec->hadException()) { 234 234 if (exception) … … 325 325 struct OpaqueJSPropertyNameArray 326 326 { 327 OpaqueJSPropertyNameArray( ) : refCount(0)327 OpaqueJSPropertyNameArray(JSGlobalData* globalData) : refCount(0), array(globalData) 328 328 { 329 329 } … … 339 339 ExecState* exec = toJS(ctx); 340 340 341 JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray( );341 JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(&exec->globalData()); 342 342 jsObject->getPropertyNames(exec, propertyNames->array); 343 343
Note:
See TracChangeset
for help on using the changeset viewer.