diff options
Diffstat (limited to 'WebCore/bridge/runtime_object.cpp')
-rw-r--r-- | WebCore/bridge/runtime_object.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/WebCore/bridge/runtime_object.cpp b/WebCore/bridge/runtime_object.cpp index 88aa560..79afd3f 100644 --- a/WebCore/bridge/runtime_object.cpp +++ b/WebCore/bridge/runtime_object.cpp @@ -66,7 +66,7 @@ void RuntimeObjectImp::invalidate() instance = 0; } -JSValuePtr RuntimeObjectImp::fallbackObjectGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue RuntimeObjectImp::fallbackObjectGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { RuntimeObjectImp* thisObj = static_cast<RuntimeObjectImp*>(asObject(slot.slotBase())); RefPtr<Instance> instance = thisObj->instance; @@ -77,14 +77,14 @@ JSValuePtr RuntimeObjectImp::fallbackObjectGetter(ExecState* exec, const Identif instance->begin(); Class *aClass = instance->getClass(); - JSValuePtr result = aClass->fallbackObject(exec, instance.get(), propertyName); + JSValue result = aClass->fallbackObject(exec, instance.get(), propertyName); instance->end(); return result; } -JSValuePtr RuntimeObjectImp::fieldGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue RuntimeObjectImp::fieldGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { RuntimeObjectImp* thisObj = static_cast<RuntimeObjectImp*>(asObject(slot.slotBase())); RefPtr<Instance> instance = thisObj->instance; @@ -96,14 +96,14 @@ JSValuePtr RuntimeObjectImp::fieldGetter(ExecState* exec, const Identifier& prop Class *aClass = instance->getClass(); Field* aField = aClass->fieldNamed(propertyName, instance.get()); - JSValuePtr result = aField->valueFromInstance(exec, instance.get()); + JSValue result = aField->valueFromInstance(exec, instance.get()); instance->end(); return result; } -JSValuePtr RuntimeObjectImp::methodGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue RuntimeObjectImp::methodGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { RuntimeObjectImp* thisObj = static_cast<RuntimeObjectImp*>(asObject(slot.slotBase())); RefPtr<Instance> instance = thisObj->instance; @@ -115,7 +115,7 @@ JSValuePtr RuntimeObjectImp::methodGetter(ExecState* exec, const Identifier& pro Class *aClass = instance->getClass(); MethodList methodList = aClass->methodsNamed(propertyName, instance.get()); - JSValuePtr result = new (exec) RuntimeMethod(exec, propertyName, methodList); + JSValue result = new (exec) RuntimeMethod(exec, propertyName, methodList); instance->end(); @@ -165,7 +165,7 @@ bool RuntimeObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& pro return instance->getOwnPropertySlot(this, exec, propertyName, slot); } -void RuntimeObjectImp::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void RuntimeObjectImp::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (!instance) { throwInvalidAccessError(exec); @@ -191,23 +191,23 @@ bool RuntimeObjectImp::deleteProperty(ExecState*, const Identifier&) return false; } -JSValuePtr RuntimeObjectImp::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const +JSValue RuntimeObjectImp::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const { if (!instance) return throwInvalidAccessError(exec); RefPtr<Instance> protector(instance); instance->begin(); - JSValuePtr result = instance->defaultValue(exec, hint); + JSValue result = instance->defaultValue(exec, hint); instance->end(); return result; } -static JSValuePtr callRuntimeObject(ExecState* exec, JSObject* function, JSValuePtr, const ArgList& args) +static JSValue JSC_HOST_CALL callRuntimeObject(ExecState* exec, JSObject* function, JSValue, const ArgList& args) { RefPtr<Instance> instance(static_cast<RuntimeObjectImp*>(function)->getInternalInstance()); instance->begin(); - JSValuePtr result = instance->invokeDefaultMethod(exec, args); + JSValue result = instance->invokeDefaultMethod(exec, args); instance->end(); return result; } @@ -224,7 +224,7 @@ static JSObject* callRuntimeConstructor(ExecState* exec, JSObject* constructor, { RefPtr<Instance> instance(static_cast<RuntimeObjectImp*>(constructor)->getInternalInstance()); instance->begin(); - JSValuePtr result = instance->invokeConstruct(exec, args); + JSValue result = instance->invokeConstruct(exec, args); instance->end(); ASSERT(result); |