-// -*- mode: c++; c-basic-offset: 4 -*-
/*
- * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2007 Eric Seidel <eric@webkit.org>
*
* Redistribution and use in source and binary forms, with or without
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <wtf/Platform.h>
#include "APICast.h"
+#include "Error.h"
#include "JSCallbackFunction.h"
#include "JSClassRef.h"
-#include "JSObjectRef.h"
#include "JSGlobalObject.h"
+#include "JSLock.h"
+#include "JSObjectRef.h"
+#include "JSString.h"
#include "JSStringRef.h"
+#include "OpaqueJSString.h"
#include "PropertyNameArray.h"
-#include "internal.h"
#include <wtf/Vector.h>
-namespace KJS {
+namespace JSC {
+
+template <class Base>
+inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValuePtr value)
+{
+ ASSERT(asObject(value)->inherits(&info));
+ return static_cast<JSCallbackObject*>(asObject(value));
+}
template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSClassRef jsClass, JSValue* prototype, void* data)
- : Base(prototype)
- , m_privateData(data)
- , m_class(JSClassRetain(jsClass))
+JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, PassRefPtr<Structure> structure, JSClassRef jsClass, void* data)
+ : Base(structure)
+ , m_callbackObjectData(new JSCallbackObjectData(data, jsClass))
{
init(exec);
}
-// Global object constructor. FIXME: Move this into a JSGlobalCallbackObject subclass.
+// Global object constructor.
+// FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one.
template <class Base>
JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass)
- : m_privateData(0)
- , m_class(JSClassRetain(jsClass))
+ : Base()
+ , m_callbackObjectData(new JSCallbackObjectData(0, jsClass))
{
ASSERT(Base::isGlobalObject());
init(static_cast<JSGlobalObject*>(this)->globalExec());
ASSERT(exec);
Vector<JSObjectInitializeCallback, 16> initRoutines;
- JSClassRef jsClass = m_class;
+ JSClassRef jsClass = classRef();
do {
if (JSObjectInitializeCallback initialize = jsClass->initialize)
initRoutines.append(initialize);
// initialize from base to derived
for (int i = static_cast<int>(initRoutines.size()) - 1; i >= 0; i--) {
- JSLock::DropAllLocks dropAllLocks;
+ JSLock::DropAllLocks dropAllLocks(exec);
JSObjectInitializeCallback initialize = initRoutines[i];
initialize(toRef(exec), toRef(this));
}
{
JSObjectRef thisRef = toRef(this);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
- if (JSObjectFinalizeCallback finalize = jsClass->finalize) {
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
+ if (JSObjectFinalizeCallback finalize = jsClass->finalize)
finalize(thisRef);
- }
-
- JSClassRelease(m_class);
}
template <class Base>
UString JSCallbackObject<Base>::className() const
{
- if (!m_class->className.isNull())
- return m_class->className;
+ UString thisClassName = classRef()->className();
+ if (!thisClassName.isNull())
+ return thisClassName;
return Base::className();
}
{
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
- JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+ RefPtr<OpaqueJSString> propertyNameRef;
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
// optional optimization to bypass getProperty in cases when we only need to know if the property exists
if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (hasProperty(ctx, thisRef, propertyNameRef)) {
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (hasProperty(ctx, thisRef, propertyNameRef.get())) {
slot.setCustom(this, callbackGetter);
return true;
}
} else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (JSValueRef value = getProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
- // cache the value so we don't have to compute it again
- // FIXME: This violates the PropertySlot design a little bit.
- // We should either use this optimization everywhere, or nowhere.
- slot.setCustom(reinterpret_cast<JSObject*>(toJS(value)), cachedValueGetter);
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (JSValueRef value = getProperty(ctx, thisRef, propertyNameRef.get(), toRef(exec->exceptionSlot()))) {
+ slot.setValue(toJS(value));
return true;
}
}
- if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+ if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
if (staticValues->contains(propertyName.ustring().rep())) {
slot.setCustom(this, staticValueGetter);
return true;
}
}
- if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+ if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
if (staticFunctions->contains(propertyName.ustring().rep())) {
slot.setCustom(this, staticFunctionGetter);
return true;
template <class Base>
bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
{
- return getOwnPropertySlot(exec, Identifier::from(propertyName), slot);
+ return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot);
}
template <class Base>
-void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
+void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot)
{
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
- JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+ RefPtr<OpaqueJSString> propertyNameRef;
JSValueRef valueRef = toRef(value);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, toRef(exec->exceptionSlot())))
return;
}
- if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+ if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
if (entry->attributes & kJSPropertyAttributeReadOnly)
return;
if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, toRef(exec->exceptionSlot())))
return;
} else
throwError(exec, ReferenceError, "Attempt to set a property that is not settable.");
}
}
- if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+ if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
if (entry->attributes & kJSPropertyAttributeReadOnly)
return;
- JSCallbackObject<Base>::putDirect(propertyName, value, attr); // put as override property
+ JSCallbackObject<Base>::putDirect(propertyName, value); // put as override property
return;
}
}
}
- return Base::put(exec, propertyName, value, attr);
-}
-
-template <class Base>
-void JSCallbackObject<Base>::put(ExecState* exec, unsigned propertyName, JSValue* value, int attr)
-{
- return put(exec, Identifier::from(propertyName), value, attr);
+ return Base::put(exec, propertyName, value, slot);
}
template <class Base>
{
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
- JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+ RefPtr<OpaqueJSString> propertyNameRef;
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (deleteProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (deleteProperty(ctx, thisRef, propertyNameRef.get(), toRef(exec->exceptionSlot())))
return true;
}
- if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+ if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
if (entry->attributes & kJSPropertyAttributeDontDelete)
return false;
}
}
- if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+ if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
if (entry->attributes & kJSPropertyAttributeDontDelete)
return false;
template <class Base>
bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(exec, Identifier::from(propertyName));
+ return deleteProperty(exec, Identifier::from(exec, propertyName));
}
template <class Base>
-bool JSCallbackObject<Base>::implementsConstruct() const
+ConstructType JSCallbackObject<Base>::getConstructData(ConstructData& constructData)
{
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
- if (jsClass->callAsConstructor)
- return true;
-
- return false;
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
+ if (jsClass->callAsConstructor) {
+ constructData.native.function = construct;
+ return ConstructTypeHost;
+ }
+ }
+ return ConstructTypeNone;
}
template <class Base>
-JSObject* JSCallbackObject<Base>::construct(ExecState* exec, const List& args)
+JSObject* JSCallbackObject<Base>::construct(ExecState* exec, JSObject* constructor, const ArgList& args)
{
JSContextRef execRef = toRef(exec);
- JSObjectRef thisRef = toRef(this);
+ JSObjectRef constructorRef = toRef(constructor);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+ for (JSClassRef jsClass = static_cast<JSCallbackObject<Base>*>(constructor)->classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callAsConstructor) {
int argumentCount = static_cast<int>(args.size());
Vector<JSValueRef, 16> arguments(argumentCount);
for (int i = 0; i < argumentCount; i++)
- arguments[i] = toRef(args[i]);
- JSLock::DropAllLocks dropAllLocks;
- return toJS(callAsConstructor(execRef, thisRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+ arguments[i] = toRef(args.at(exec, i));
+ JSLock::DropAllLocks dropAllLocks(exec);
+ return toJS(callAsConstructor(execRef, constructorRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
}
}
- ASSERT(0); // implementsConstruct should prevent us from reaching here
+ ASSERT_NOT_REACHED(); // getConstructData should prevent us from reaching here
return 0;
}
template <class Base>
-bool JSCallbackObject<Base>::implementsHasInstance() const
-{
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
- if (jsClass->hasInstance)
- return true;
-
- return false;
-}
-
-template <class Base>
-bool JSCallbackObject<Base>::hasInstance(ExecState *exec, JSValue *value)
+bool JSCallbackObject<Base>::hasInstance(ExecState* exec, JSValuePtr value, JSValuePtr)
{
JSContextRef execRef = toRef(exec);
JSObjectRef thisRef = toRef(this);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectHasInstanceCallback hasInstance = jsClass->hasInstance) {
- JSLock::DropAllLocks dropAllLocks;
+ JSLock::DropAllLocks dropAllLocks(exec);
return hasInstance(execRef, thisRef, toRef(value), toRef(exec->exceptionSlot()));
}
-
- ASSERT_NOT_REACHED(); // implementsHasInstance should prevent us from reaching here
- return 0;
+ }
+ return false;
}
-
template <class Base>
-bool JSCallbackObject<Base>::implementsCall() const
+CallType JSCallbackObject<Base>::getCallData(CallData& callData)
{
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
- if (jsClass->callAsFunction)
- return true;
-
- return false;
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
+ if (jsClass->callAsFunction) {
+ callData.native.function = call;
+ return CallTypeHost;
+ }
+ }
+ return CallTypeNone;
}
template <class Base>
-JSValue* JSCallbackObject<Base>::callAsFunction(ExecState* exec, JSObject* thisObj, const List &args)
+JSValuePtr JSCallbackObject<Base>::call(ExecState* exec, JSObject* functionObject, JSValuePtr thisValue, const ArgList& args)
{
JSContextRef execRef = toRef(exec);
- JSObjectRef thisRef = toRef(this);
- JSObjectRef thisObjRef = toRef(thisObj);
+ JSObjectRef functionRef = toRef(functionObject);
+ JSObjectRef thisObjRef = toRef(thisValue.toThisObject(exec));
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+ for (JSClassRef jsClass = static_cast<JSCallbackObject<Base>*>(functionObject)->classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callAsFunction) {
int argumentCount = static_cast<int>(args.size());
Vector<JSValueRef, 16> arguments(argumentCount);
for (int i = 0; i < argumentCount; i++)
- arguments[i] = toRef(args[i]);
- JSLock::DropAllLocks dropAllLocks;
- return toJS(callAsFunction(execRef, thisRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+ arguments[i] = toRef(args.at(exec, i));
+ JSLock::DropAllLocks dropAllLocks(exec);
+ return toJS(callAsFunction(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
}
}
- ASSERT_NOT_REACHED(); // implementsCall should prevent us from reaching here
- return 0;
+ ASSERT_NOT_REACHED(); // getCallData should prevent us from reaching here
+ return noValue();
}
template <class Base>
JSContextRef execRef = toRef(exec);
JSObjectRef thisRef = toRef(this);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) {
- JSLock::DropAllLocks dropAllLocks;
+ JSLock::DropAllLocks dropAllLocks(exec);
getPropertyNames(execRef, thisRef, toRef(&propertyNames));
}
- if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
- typedef OpaqueJSClass::StaticValuesTable::const_iterator iterator;
+ if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+ typedef OpaqueJSClassStaticValuesTable::const_iterator iterator;
iterator end = staticValues->end();
for (iterator it = staticValues->begin(); it != end; ++it) {
UString::Rep* name = it->first.get();
StaticValueEntry* entry = it->second;
if (entry->getProperty && !(entry->attributes & kJSPropertyAttributeDontEnum))
- propertyNames.add(Identifier(name));
+ propertyNames.add(Identifier(exec, name));
}
}
- if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
- typedef OpaqueJSClass::StaticFunctionsTable::const_iterator iterator;
+ if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+ typedef OpaqueJSClassStaticFunctionsTable::const_iterator iterator;
iterator end = staticFunctions->end();
for (iterator it = staticFunctions->begin(); it != end; ++it) {
UString::Rep* name = it->first.get();
StaticFunctionEntry* entry = it->second;
if (!(entry->attributes & kJSPropertyAttributeDontEnum))
- propertyNames.add(Identifier(name));
+ propertyNames.add(Identifier(exec, name));
}
}
}
template <class Base>
double JSCallbackObject<Base>::toNumber(ExecState* exec) const
{
+ // We need this check to guard against the case where this object is rhs of
+ // a binary expression where lhs threw an exception in its conversion to
+ // primitive
+ if (exec->hadException())
+ return NaN;
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
- JSLock::DropAllLocks dropAllLocks;
- if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
- return toJS(value)->getNumber();
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot()))) {
+ double dValue;
+ return toJS(value).getNumber(dValue) ? dValue : NaN;
+ }
}
return Base::toNumber(exec);
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
- JSLock::DropAllLocks dropAllLocks;
- if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeString, toRef(exec->exceptionSlot())))
- return toJS(value)->getString();
+ JSValueRef value;
+ {
+ JSLock::DropAllLocks dropAllLocks(exec);
+ value = convertToType(ctx, thisRef, kJSTypeString, toRef(exec->exceptionSlot()));
+ }
+ if (value)
+ return toJS(value).getString();
}
return Base::toString(exec);
template <class Base>
void JSCallbackObject<Base>::setPrivate(void* data)
{
- m_privateData = data;
+ m_callbackObjectData->privateData = data;
}
template <class Base>
void* JSCallbackObject<Base>::getPrivate()
{
- return m_privateData;
+ return m_callbackObjectData->privateData;
}
template <class Base>
bool JSCallbackObject<Base>::inherits(JSClassRef c) const
{
- for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+ for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
if (jsClass == c)
return true;
}
template <class Base>
-JSValue* JSCallbackObject<Base>::cachedValueGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot& slot)
-{
- JSValue* v = slot.slotBase();
- ASSERT(v);
- return v;
-}
-
-template <class Base>
-JSValue* JSCallbackObject<Base>::staticValueGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
+JSValuePtr JSCallbackObject<Base>::staticValueGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
- ASSERT(slot.slotBase()->inherits(&JSCallbackObject::info));
- JSCallbackObject* thisObj = static_cast<JSCallbackObject*>(slot.slotBase());
+ JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
JSObjectRef thisRef = toRef(thisObj);
- JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+ RefPtr<OpaqueJSString> propertyNameRef;
- for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
- if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues)
+ for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass)
+ if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec))
if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), toRef(exec->exceptionSlot())))
return toJS(value);
}
}
template <class Base>
-JSValue* JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
+JSValuePtr JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
- ASSERT(slot.slotBase()->inherits(&JSCallbackObject::info));
- JSCallbackObject* thisObj = static_cast<JSCallbackObject*>(slot.slotBase());
+ JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
// Check for cached or override property.
- PropertySlot slot2;
+ PropertySlot slot2(thisObj);
if (thisObj->Base::getOwnPropertySlot(exec, propertyName, slot2))
- return slot2.getValue(exec, thisObj, propertyName);
+ return slot2.getValue(exec, propertyName);
- for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass) {
- if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+ for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
+ if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
- JSObject* o = new JSCallbackFunction(exec, callAsFunction, propertyName);
+ JSObject* o = new (exec) JSCallbackFunction(exec, callAsFunction, propertyName);
thisObj->putDirect(propertyName, o, entry->attributes);
return o;
}
}
template <class Base>
-JSValue* JSCallbackObject<Base>::callbackGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
+JSValuePtr JSCallbackObject<Base>::callbackGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
- ASSERT(slot.slotBase()->inherits(&JSCallbackObject::info));
- JSCallbackObject* thisObj = static_cast<JSCallbackObject*>(slot.slotBase());
+ JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
JSObjectRef thisRef = toRef(thisObj);
- JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+ RefPtr<OpaqueJSString> propertyNameRef;
- for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
+ for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass)
if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
- JSLock::DropAllLocks dropAllLocks;
- if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
+ if (!propertyNameRef)
+ propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+ JSLock::DropAllLocks dropAllLocks(exec);
+ if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), toRef(exec->exceptionSlot())))
return toJS(value);
}
return throwError(exec, ReferenceError, "hasProperty callback returned true for a property that doesn't exist.");
}
-} // namespace KJS
+} // namespace JSC
projects / apple / javascriptcore.git / blobdiff