diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
| commit | 635860845790a19bf50bbc51ba8fb66a96dde068 (patch) | |
| tree | ef6ad9ff73a5b57f65249d4232a202fa77e6a140 /JavaScriptGlue/UserObjectImp.cpp | |
| parent | 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff) | |
| download | external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2 | |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'JavaScriptGlue/UserObjectImp.cpp')
| -rw-r--r-- | JavaScriptGlue/UserObjectImp.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/JavaScriptGlue/UserObjectImp.cpp b/JavaScriptGlue/UserObjectImp.cpp index eb3bced..f40a18c 100644 --- a/JavaScriptGlue/UserObjectImp.cpp +++ b/JavaScriptGlue/UserObjectImp.cpp @@ -34,7 +34,7 @@ const ClassInfo UserObjectImp::info = { "UserObject", 0, 0, 0 }; -UserObjectImp::UserObjectImp(PassRefPtr<StructureID> structure, JSUserObject* userObject) +UserObjectImp::UserObjectImp(PassRefPtr<Structure> structure, JSUserObject* userObject) : JSObject(structure) , fJSUserObject((JSUserObject*)userObject->Retain()) { @@ -56,9 +56,9 @@ CallType UserObjectImp::getCallData(CallData& callData) return fJSUserObject ? fJSUserObject->getCallData(callData) : CallTypeNone; } -JSValue* UserObjectImp::callAsFunction(ExecState *exec, JSObject *thisObj, const ArgList &args) +JSValuePtr UserObjectImp::callAsFunction(ExecState *exec, JSObject *thisObj, const ArgList &args) { - JSValue* result = jsUndefined(); + JSValuePtr result = jsUndefined(); JSUserObject* jsThisObj = KJSValueToJSObject(thisObj, exec); if (jsThisObj) { CFIndex argCount = args.size(); @@ -112,7 +112,7 @@ void UserObjectImp::getPropertyNames(ExecState *exec, PropertyNameArray& propert JSObject::getPropertyNames(exec, propertyNames); } -JSValue* UserObjectImp::userObjectGetter(ExecState*, const Identifier& propertyName, const PropertySlot& slot) +JSValuePtr 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 @@ JSValue* UserObjectImp::userObjectGetter(ExecState*, const Identifier& property CFStringRef cfPropName = IdentifierToCFString(propertyName); JSUserObject *jsResult = thisObj->fJSUserObject->CopyProperty(cfPropName); ReleaseCFType(cfPropName); - JSValue* result = JSObjectKJSValue(jsResult); + JSValuePtr result = JSObjectKJSValue(jsResult); jsResult->Release(); return result; @@ -140,9 +140,9 @@ bool UserObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& proper jsResult->Release(); return true; } else { - JSValue* kjsValue = toPrimitive(exec); - if (!kjsValue->isUndefinedOrNull()) { - JSObject *kjsObject = kjsValue->toObject(exec); + JSValuePtr kjsValue = toPrimitive(exec); + if (!kjsValue.isUndefinedOrNull()) { + JSObject* kjsObject = kjsValue.toObject(exec); if (kjsObject->getPropertySlot(exec, propertyName, slot)) return true; } @@ -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, JSValue* value, int attr) +void UserObjectImp::put(ExecState *exec, const Identifier &propertyName, JSValuePtr value, int attr) { if (!fJSUserObject) return; @@ -169,9 +169,9 @@ JSUserObject* UserObjectImp::GetJSUserObject() const return fJSUserObject; } -JSValue* UserObjectImp::toPrimitive(ExecState *exec, JSType) const +JSValuePtr UserObjectImp::toPrimitive(ExecState *exec, JSType) const { - JSValue* result = jsUndefined(); + JSValuePtr result = jsUndefined(); JSUserObject* jsObjPtr = KJSValueToJSObject(toObject(exec), exec); CFTypeRef cfValue = jsObjPtr ? jsObjPtr->CopyCFValue() : 0; if (cfValue) { |