diff options
Diffstat (limited to 'JavaScriptGlue/UserObjectImp.cpp')
| -rw-r--r-- | JavaScriptGlue/UserObjectImp.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/JavaScriptGlue/UserObjectImp.cpp b/JavaScriptGlue/UserObjectImp.cpp index f40a18c..4e64ab1 100644 --- a/JavaScriptGlue/UserObjectImp.cpp +++ b/JavaScriptGlue/UserObjectImp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2005, 2008, 2009 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -56,9 +56,9 @@ CallType UserObjectImp::getCallData(CallData& callData) return fJSUserObject ? fJSUserObject->getCallData(callData) : CallTypeNone; } -JSValuePtr UserObjectImp::callAsFunction(ExecState *exec, JSObject *thisObj, const ArgList &args) +JSValue UserObjectImp::callAsFunction(ExecState *exec, JSObject *thisObj, const ArgList &args) { - JSValuePtr result = jsUndefined(); + JSValue result = jsUndefined(); JSUserObject* jsThisObj = KJSValueToJSObject(thisObj, exec); if (jsThisObj) { CFIndex argCount = args.size(); @@ -67,7 +67,7 @@ JSValuePtr UserObjectImp::callAsFunction(ExecState *exec, JSObject *thisObj, con CFMutableArrayRef jsArgs = CFArrayCreateMutable(0, 0, &arrayCallBacks); if (jsArgs) { for (CFIndex i = 0; i < argCount; i++) { - JSUserObject* jsArg = KJSValueToJSObject(args.at(exec, i), exec); + JSUserObject* jsArg = KJSValueToJSObject(args.at(i), exec); CFArrayAppendValue(jsArgs, (void*)jsArg); jsArg->Release(); } @@ -112,7 +112,7 @@ void UserObjectImp::getPropertyNames(ExecState *exec, PropertyNameArray& propert JSObject::getPropertyNames(exec, propertyNames); } -JSValuePtr UserObjectImp::userObjectGetter(ExecState*, const Identifier& propertyName, const PropertySlot& slot) +JSValue UserObjectImp::userObjectGetter(ExecState*, const Identifier& propertyName, const PropertySlot& slot) { UserObjectImp *thisObj = static_cast<UserObjectImp *>(asObject(slot.slotBase())); // getOwnPropertySlot should have guarded against a null fJSUserObject. @@ -121,7 +121,7 @@ JSValuePtr UserObjectImp::userObjectGetter(ExecState*, const Identifier& propert CFStringRef cfPropName = IdentifierToCFString(propertyName); JSUserObject *jsResult = thisObj->fJSUserObject->CopyProperty(cfPropName); ReleaseCFType(cfPropName); - JSValuePtr result = JSObjectKJSValue(jsResult); + JSValue result = JSObjectKJSValue(jsResult); jsResult->Release(); return result; @@ -140,7 +140,7 @@ bool UserObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& proper jsResult->Release(); return true; } else { - JSValuePtr kjsValue = toPrimitive(exec); + JSValue kjsValue = toPrimitive(exec); if (!kjsValue.isUndefinedOrNull()) { JSObject* kjsObject = kjsValue.toObject(exec); if (kjsObject->getPropertySlot(exec, propertyName, slot)) @@ -150,7 +150,7 @@ bool UserObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& proper return JSObject::getOwnPropertySlot(exec, propertyName, slot); } -void UserObjectImp::put(ExecState *exec, const Identifier &propertyName, JSValuePtr value, int attr) +void UserObjectImp::put(ExecState *exec, const Identifier &propertyName, JSValue value, PutPropertySlot&) { if (!fJSUserObject) return; @@ -169,9 +169,9 @@ JSUserObject* UserObjectImp::GetJSUserObject() const return fJSUserObject; } -JSValuePtr UserObjectImp::toPrimitive(ExecState *exec, JSType) const +JSValue UserObjectImp::toPrimitive(ExecState *exec, JSType) const { - JSValuePtr result = jsUndefined(); + JSValue result = jsUndefined(); JSUserObject* jsObjPtr = KJSValueToJSObject(toObject(exec), exec); CFTypeRef cfValue = jsObjPtr ? jsObjPtr->CopyCFValue() : 0; if (cfValue) { @@ -409,9 +409,9 @@ UString UserObjectImp::toString(ExecState *exec) const return result; } -void UserObjectImp::mark() +void UserObjectImp::markChildren(MarkStack& markStack) { - JSObject::mark(); + JSObject::markChildren(markStack); if (fJSUserObject) fJSUserObject->Mark(); } |