Changeset 15317 in webkit for trunk/JavaScriptCore/API/JSCallbackObject.cpp

Timestamp:

Jul 10, 2006, 5:26:25 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Darin.

Added exception out parameter to API object callbacks, removed semi-bogus
JSContext(.*)Exception functions.

To make these calls syntactically simple, I added an exceptionSlot()
method to the ExecState class, which provides a JSValue slot in which to
store a JSValue* exception.

• API/APICast.h: (toRef):
• API/JSCallbackConstructor.cpp: (KJS::JSCallbackConstructor::construct):
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::callAsFunction):
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::init): (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::construct): (KJS::JSCallbackObject::callAsFunction): (KJS::JSCallbackObject::getPropertyList): (KJS::JSCallbackObject::toBoolean): (KJS::JSCallbackObject::toNumber): (KJS::JSCallbackObject::toString): (KJS::JSCallbackObject::staticValueGetter): (KJS::JSCallbackObject::callbackGetter):
• API/JSContextRef.cpp: (JSCheckSyntax):
• API/JSContextRef.h:
• API/JSNode.c: (JSNodePrototype_appendChild): (JSNodePrototype_removeChild): (JSNodePrototype_replaceChild): (JSNode_getNodeType): (JSNode_getChildNodes): (JSNode_getFirstChild): (JSNode_construct):
• API/JSNode.h:
• API/JSNodeList.c: (JSNodeListPrototype_item): (JSNodeList_length): (JSNodeList_getProperty):
• API/JSObjectRef.h:
• API/minidom.c: (print):
• API/testapi.c: (MyObject_initialize): (MyObject_hasProperty): (MyObject_getProperty): (MyObject_setProperty): (MyObject_deleteProperty): (MyObject_getPropertyList): (MyObject_callAsFunction): (MyObject_callAsConstructor): (MyObject_convertToType): (print_callAsFunction): (myConstructor_callAsConstructor): (main):
• JavaScriptCore.exp:
• kjs/ExecState.h: (KJS::ExecState::exceptionHandle):

File:

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

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -52 +52 @@
 void JSCallbackObject::init(JSContextRef context, JSClassRef jsClass)
 {
+    ExecState* exec = toJS(context);
+    
     m_privateData = 0;
     m_class = JSClassRetain(jsClass);
@@ -59 +61 @@
     do {
         if (JSInitializeCallback initialize = jsClass->callbacks.initialize)
-            initialize(context, thisRef);
+            initialize(context, thisRef, toRef(exec->exceptionSlot()));
     } while ((jsClass = jsClass->parent));
 }
@@ -84 +86 @@
     JSObjectRef thisRef = toRef(this);
     JSInternalStringRef propertyNameRef = toRef(propertyName.ustring().rep());
-    
+
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         // optional optimization to bypass getProperty in cases when we only need to know if the property exists
         if (JSHasPropertyCallback hasPropertyCallback = jsClass->callbacks.hasProperty) {
-            if (hasPropertyCallback(context, thisRef, propertyNameRef)) {
+            if (hasPropertyCallback(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
                 slot.setCustom(this, callbackGetter);
                 return true;
@@ -94 +96 @@
         } else if (JSGetPropertyCallback getPropertyCallback = jsClass->callbacks.getProperty) {
             JSValueRef returnValue;
-            if (getPropertyCallback(context, thisRef, propertyNameRef, &returnValue)) {
+            if (getPropertyCallback(context, thisRef, propertyNameRef, &returnValue, toRef(exec->exceptionSlot()))) {
                 // cache the value so we don't have to compute it again
                 // FIXME: This violates the PropertySlot design a little bit.
@@ -137 +139 @@
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         if (JSSetPropertyCallback setPropertyCallback = jsClass->callbacks.setProperty) {
-            if (setPropertyCallback(context, thisRef, propertyNameRef, valueRef))
+            if (setPropertyCallback(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
                 return;
         }
@@ -146 +148 @@
                     return;
                 if (JSSetPropertyCallback setPropertyCallback = entry->setProperty) {
-                    if (setPropertyCallback(context, thisRef, propertyNameRef, valueRef))
+                    if (setPropertyCallback(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
                         return;
                 }
@@ -177 +179 @@
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         if (JSDeletePropertyCallback deletePropertyCallback = jsClass->callbacks.deleteProperty) {
-            if (deletePropertyCallback(context, thisRef, propertyNameRef))
+            if (deletePropertyCallback(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
                 return true;
         }
@@ -225 +227 @@
             for (size_t i = 0; i < argc; i++)
                 argv[i] = toRef(args[i]);
-            return toJS(callAsConstructorCallback(execRef, thisRef, argc, argv));
+            return toJS(callAsConstructorCallback(execRef, thisRef, argc, argv, toRef(exec->exceptionSlot())));
         }
     }
@@ -254 +256 @@
             for (size_t i = 0; i < argc; i++)
                 argv[i] = toRef(args[i]);
-            return toJS(callAsFunctionCallback(execRef, thisRef, thisObjRef, argc, argv));
+            return toJS(callAsFunctionCallback(execRef, thisRef, thisObjRef, argc, argv, toRef(exec->exceptionSlot())));
         }
     }
@@ -269 +271 @@
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         if (JSGetPropertyListCallback getPropertyListCallback = jsClass->callbacks.getPropertyList)
-            getPropertyListCallback(context, thisRef, toRef(&propertyList));
+            getPropertyListCallback(context, thisRef, toRef(&propertyList), toRef(exec->exceptionSlot()));
 
         if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
@@ -305 +307 @@
         if (JSConvertToTypeCallback convertToTypeCallback = jsClass->callbacks.convertToType) {
             JSValueRef returnValue;
-            if (convertToTypeCallback(context, thisRef, kJSTypeBoolean, &returnValue))
+            if (convertToTypeCallback(context, thisRef, kJSTypeBoolean, &returnValue, toRef(exec->exceptionSlot())))
                 return toJS(returnValue)->getBoolean();
         }
@@ -320 +322 @@
         if (JSConvertToTypeCallback convertToTypeCallback = jsClass->callbacks.convertToType) {
             JSValueRef returnValue;
-            if (convertToTypeCallback(context, thisRef, kJSTypeNumber, &returnValue))
+            if (convertToTypeCallback(context, thisRef, kJSTypeNumber, &returnValue, toRef(exec->exceptionSlot())))
                 return toJS(returnValue)->getNumber();
         }
@@ -335 +337 @@
         if (JSConvertToTypeCallback convertToTypeCallback = jsClass->callbacks.convertToType) {
             JSValueRef returnValue;
-            if (convertToTypeCallback(context, thisRef, kJSTypeString, &returnValue))
+            if (convertToTypeCallback(context, thisRef, kJSTypeString, &returnValue, toRef(exec->exceptionSlot())))
                 return toJS(returnValue)->getString();
         }
@@ -381 +383 @@
             if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
                 if (JSGetPropertyCallback getPropertyCallback = entry->getProperty)
-                    if (getPropertyCallback(toRef(exec), thisRef, propertyNameRef, &returnValue))
+                    if (getPropertyCallback(toRef(exec), thisRef, propertyNameRef, &returnValue, toRef(exec->exceptionSlot())))
                         return toJS(returnValue);
     }
@@ -421 +423 @@
 
         if (JSGetPropertyCallback getPropertyCallback = jsClass->callbacks.getProperty)
-            if (getPropertyCallback(toRef(exec), thisRef, propertyNameRef, &returnValue))
+            if (getPropertyCallback(toRef(exec), thisRef, propertyNameRef, &returnValue, toRef(exec->exceptionSlot())))
                 return toJS(returnValue);
     }