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

Timestamp:

Jul 16, 2006, 6:48:27 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Properly document and handle NULL callbacks for static properties. We throw an exception in any case other than a ReadOnly property with a NULL setProperty callback, because a NULL callback almost certainly indicates a programming error. Also throw an exception if hasProperty returns true for a property that getProperty can't get.

• If a static setProperty callback returns 'false', to indicate that the property was not set, we no longer forward the set request up the class chain, because that's almost certainly not what the programmer expected.

• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::staticValueGetter): (KJS::JSCallbackObject::staticFunctionGetter): (KJS::JSCallbackObject::callbackGetter):
• API/JSObjectRef.h:
• API/minidom.js:
• API/testapi.c: (MyObject_hasProperty):
• API/testapi.js:

File:

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

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -108 +108 @@
 
         if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
-                if (entry->getProperty) {
-                    slot.setCustom(this, staticValueGetter);
-                    return true;
-                }
+            if (staticValues->contains(propertyName.ustring().rep())) {
+                slot.setCustom(this, staticValueGetter);
+                return true;
             }
         }
@@ -149 +147 @@
                 if (entry->attributes & kJSPropertyAttributeReadOnly)
                     return;
-                if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
-                    if (setProperty(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
-                        return;
-                }
+                if (JSObjectSetPropertyCallback setProperty = entry->setProperty)
+                    setProperty(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot()));
+                else
+                    throwError(exec, ReferenceError, "Writable static value property defined with NULL setProperty callback.");
             }
         }
@@ -393 +391 @@
                         return toJS(value);
 
-    return jsUndefined();
+    return throwError(exec, ReferenceError, "Static value property defined with NULL getProperty callback.");
 }
 
@@ -407 +405 @@
         if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
             if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
-                JSObject* o = new JSCallbackFunction(exec, entry->callAsFunction, propertyName);
-                thisObj->putDirect(propertyName, o, entry->attributes);
-                return o;
-            }
-        }
-    }
-
-    return jsUndefined();
+                if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
+                    JSObject* o = new JSCallbackFunction(exec, callAsFunction, propertyName);
+                    thisObj->putDirect(propertyName, o, entry->attributes);
+                    return o;
+                }
+            }
+        }
+    }
+
+    return throwError(exec, ReferenceError, "Static function property defined with NULL callAsFunction callback.");
 }
 
@@ -430 +430 @@
                 return toJS(value);
 
-    return jsUndefined();
+    return throwError(exec, ReferenceError, "hasProperty callback returned true for a property that doesn't exist.");
 }