Changeset 15462 for trunk/JavaScriptCore/API/JSCallbackObject.cpp

Timestamp:

07/15/06 18:28:25 (2 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Moved the arguments passed to JSClassCreate into a single structure, called JSClassDefinition. This will enable easier structure migration/versioning in the future, if necessary.

• Added support for class names.

• kJSClassDefinitionNull replaces kJSObjectCallbacksNone.

• JSClass is becoming a fairly complex struct, so I migrated all of its implementation other than reference counting to the sruct.

• Also moved JSClass* functions in the API to JSObjectRef.cpp, since they're declared in JSObjectRef.h

• Also added some more informative explanation to the class structure doc.

Files:

• trunk/JavaScriptCore/API/JSCallbackObject.cpp (modified) (19 diffs)

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -60 +60 @@
     
     do {
-        if (JSObjectInitializeCallback initialize = jsClass->callbacks.initialize)
+        if (JSObjectInitializeCallback initialize = jsClass->initialize)
             initialize(context, thisRef, toRef(exec->exceptionSlot()));
-    } while ((jsClass = jsClass->parent));
+    } while ((jsClass = jsClass->parentClass));
 }
 
@@ -69 +69 @@
     JSObjectRef thisRef = toRef(this);
     
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (JSObjectFinalizeCallback finalize = jsClass->callbacks.finalize)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (JSObjectFinalizeCallback finalize = jsClass->finalize)
             finalize(thisRef);
     
@@ -78 +78 @@
 UString JSCallbackObject::className() const
 {
-    return classInfo()->className;
+    if (!m_class->className.isNull())
+        return m_class->className;
+    
+    return JSObject::className();
 }
 
@@ -87 +90 @@
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
+    for (JSClassRef jsClass = m_class; 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->callbacks.hasProperty) {
+        if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
             if (hasProperty(context, thisRef, propertyNameRef)) {
                 slot.setCustom(this, callbackGetter);
                 return true;
             }
-        } else if (JSObjectGetPropertyCallback getProperty = jsClass->callbacks.getProperty) {
+        } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
             if (JSValueRef value = getProperty(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
                 // cache the value so we don't have to compute it again
@@ -136 +139 @@
     JSValueRef valueRef = toRef(value);
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
-        if (JSObjectSetPropertyCallback setProperty = jsClass->callbacks.setProperty) {
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+        if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
             if (setProperty(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
                 return;
@@ -177 +180 @@
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
     
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
-        if (JSObjectDeletePropertyCallback deleteProperty = jsClass->callbacks.deleteProperty) {
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+        if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
             if (deleteProperty(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
                 return true;
@@ -210 +213 @@
 bool JSCallbackObject::implementsConstruct() const
 {
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (jsClass->callbacks.callAsConstructor)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (jsClass->callAsConstructor)
             return true;
 
@@ -222 +225 @@
     JSObjectRef thisRef = toRef(this);
     
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
-        if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callbacks.callAsConstructor) {
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+        if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callAsConstructor) {
             size_t argumentCount = args.size();
             JSValueRef arguments[argumentCount];
@@ -238 +241 @@
 bool JSCallbackObject::implementsHasInstance() const
 {
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (jsClass->callbacks.hasInstance)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (jsClass->hasInstance)
             return true;
 
@@ -250 +253 @@
     JSObjectRef thisRef = toRef(this);
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (JSObjectHasInstanceCallback hasInstance = jsClass->callbacks.hasInstance)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (JSObjectHasInstanceCallback hasInstance = jsClass->hasInstance)
             return hasInstance(execRef, thisRef, toRef(value), toRef(exec->exceptionSlot()));
 
@@ -261 +264 @@
 bool JSCallbackObject::implementsCall() const
 {
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (jsClass->callbacks.callAsFunction)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (jsClass->callAsFunction)
             return true;
     
@@ -274 +277 @@
     JSObjectRef thisObjRef = toRef(thisObj);
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
-        if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callbacks.callAsFunction) {
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+        if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callAsFunction) {
             size_t argumentCount = args.size();
             JSValueRef arguments[argumentCount];
@@ -292 +295 @@
     JSObjectRef thisRef = toRef(this);
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
-        if (JSObjectAddPropertiesToListCallback addPropertiesToList = jsClass->callbacks.addPropertiesToList)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+        if (JSObjectAddPropertiesToListCallback addPropertiesToList = jsClass->addPropertiesToList)
             addPropertiesToList(thisRef, toRef(&propertyList));
 
@@ -327 +330 @@
     JSObjectRef thisRef = toRef(this);
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->callbacks.convertToType)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType)
             if (JSValueRef value = convertToType(context, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
                 return toJS(value)->getNumber();
@@ -340 +343 @@
     JSObjectRef thisRef = toRef(this);
 
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->callbacks.convertToType)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType)
             if (JSValueRef value = convertToType(context, thisRef, kJSTypeString, toRef(exec->exceptionSlot())))
                 return toJS(value)->getString();
@@ -360 +363 @@
 bool JSCallbackObject::inherits(JSClassRef c) const
 {
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
+    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
         if (jsClass == c)
             return true;
@@ -382 +385 @@
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
 
-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parent)
+    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
         if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues)
             if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
@@ -400 +403 @@
         return cachedOrOverrideValue;
 
-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parent) {
+    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass) {
         if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
             if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
@@ -421 +424 @@
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
 
-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parent)
-        if (JSObjectGetPropertyCallback getProperty = jsClass->callbacks.getProperty)
+    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
+        if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty)
             if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
                 return toJS(value);