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

Timestamp:

Jul 14, 2006, 9:10:31 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Finalized exception handling in the API.

setProperty can throw because it throws for built-in arrays. getProperty
and deleteProperty can throw because setProperty can throw and we want
to be consistent, and also because they seem like "actions." callAsFunction,
callAsConstructor, and hasInstance can throw, because they caan throw for
all built-ins.

toBoolean can't throw because it's defined that way in the spec.

• Documented that toBoolean and toObject can't be overridden by custom objects because they're defined that way in the spec.

File:

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

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -90 +90 @@
         // optional optimization to bypass getProperty in cases when we only need to know if the property exists
         if (JSObjectHasPropertyCallback hasProperty = jsClass->callbacks.hasProperty) {
-            if (hasProperty(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
+            if (hasProperty(context, thisRef, propertyNameRef)) {
                 slot.setCustom(this, callbackGetter);
                 return true;
@@ -322 +322 @@
 }
 
-bool JSCallbackObject::toBoolean(ExecState* exec) const
-{
-    JSContextRef context = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->callbacks.convertToType)
-            if (JSValueRef value = convertToType(context, thisRef, kJSTypeBoolean, toRef(exec->exceptionSlot())))
-                return toJS(value)->getBoolean();
-
-    return JSObject::toBoolean(exec);
-}
-
 double JSCallbackObject::toNumber(ExecState* exec) const
 {