Changeset 15473 in webkit for trunk/JavaScriptCore/API

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:

Location:

trunk/JavaScriptCore/API

Files:

• JSCallbackObject.cpp (modified) (5 diffs)
• JSObjectRef.h (modified) (1 diff)
• minidom.js (modified) (2 diffs)
• testapi.c (modified) (3 diffs)
• testapi.js (modified) (3 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.");
 }
 

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -263 +263 @@
 @field name A null-terminated UTF8 string containing the property's name.
 @field getProperty A JSObjectGetPropertyCallback to invoke when getting the property's value.
-@field setProperty A JSObjectSetPropertyCallback to invoke when setting the property's value.
+@field setProperty A JSObjectSetPropertyCallback to invoke when setting the property's value. May be NULL if the ReadOnly attribute is set.
 @field attributes A logically ORed set of JSPropertyAttributes to give to the property.
 */

trunk/JavaScriptCore/API/minidom.js

@@ -166 +166 @@
 }
 
+function shouldBe(a, b)
+{
+    var evalA;
+    try {
+        evalA = eval(a);
+    } catch(e) {
+        evalA = e;
+    }
+    
+    if (evalA == b || isNaN(evalA) && typeof evalA == 'number' && isNaN(b) && typeof b == 'number')
+        print("PASS: " + a + " should be " + b + " and is.", "green");
+    else
+        print("__FAIL__: " + a + " should be " + b + " but instead is " + evalA + ".", "red");
+}
+
 function test()
 {
@@ -222 +237 @@
         print("caught: " + e);
     }
+    
+    oldNodeType = node.nodeType;
+    node.nodeType = 1;
+    shouldBe("node.nodeType", oldNodeType);
 
     /*

trunk/JavaScriptCore/API/testapi.c

@@ -115 +115 @@
     if (JSStringIsEqualToUTF8CString(propertyName, "alwaysOne")
         || JSStringIsEqualToUTF8CString(propertyName, "cantFind")
-        || JSStringIsEqualToUTF8CString(propertyName, "myPropertyName")) {
+        || JSStringIsEqualToUTF8CString(propertyName, "myPropertyName")
+        || JSStringIsEqualToUTF8CString(propertyName, "hasPropertyLie")) {
         return true;
     }
@@ -243 +244 @@
 }
 
+static JSStaticValue evilStaticValues[] = {
+    { "nullGetSet", 0, 0, kJSPropertyAttributeNone },
+    { 0, 0, 0, 0 }
+};
+
+static JSStaticFunction evilStaticFunctions[] = {
+    { "nullCall", 0, kJSPropertyAttributeNone },
+    { 0, 0, 0 }
+};
+
 JSClassDefinition MyObject_definition = {
     0,
@@ -249 +260 @@
     NULL,
     
-    NULL,
-    NULL,
+    evilStaticValues,
+    evilStaticFunctions,
     
     MyObject_initialize,

trunk/JavaScriptCore/API/testapi.js

@@ -40 +40 @@
 }
 
+function shouldThrow(a)
+{
+    var result = "__FAIL__: " + a + " did not throw an exception.";
+    
+    var evalA;
+    try {
+        eval(a);
+    } catch(e) {
+        result = "PASS: " + a + " threw: " + e;
+    }
+    
+    print(result);
+}
+
 shouldBe("typeof MyObject", "function"); // our object implements 'call'
 MyObject.cantFind = 1;
@@ -69 +83 @@
       : "__FAIL__: MyObject.regularType was not enumerated");
 
+myObject = new MyObject();
+
 shouldBe("delete MyObject.regularType", true);
 shouldBe("MyObject.regularType", undefined);
 shouldBe("MyObject(0)", 1);
 shouldBe("MyObject()", undefined);
-shouldBe("typeof new MyObject()", "object");
+shouldBe("typeof myObject", "object");
 shouldBe("MyObject ? 1 : 0", true); // toBoolean
 shouldBe("+MyObject", 1); // toNumber
@@ -83 +99 @@
 shouldBe("typeof constructedObject", "object");
 shouldBe("constructedObject.value", 1);
-shouldBe("(new MyObject()) instanceof MyObject", true);
+shouldBe("myObject instanceof MyObject", true);
 shouldBe("(new Object()) instanceof MyObject", false);
+
+shouldThrow("MyObject.nullGetSet = 1");
+shouldThrow("MyObject.nullGetSet");
+shouldThrow("MyObject.nullCall()");
+shouldThrow("MyObject.hasPropertyLie");