Changeset 15310 in webkit for trunk/JavaScriptCore/API/JSNode.c

Timestamp:

Jul 10, 2006, 2:17:26 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Darin.

Improved type safety by implementing opaque JSValue/JSObject typing through
abuse of 'const', not void*. Also fixed an alarming number of bugs
exposed by this new type safety.

I made one design change in JavaScriptCore, which is that the JSObject
constructor should take a JSValue* as its prototype argument, not a JSObject*,
since we allow the prototype to be any JSValue*, including jsNull(), for
example.

• API/APICast.h: (toJS):
• API/JSBase.h:
• API/JSCallbackConstructor.cpp: (KJS::JSCallbackConstructor::construct):
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::callAsFunction):
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::JSCallbackObject): (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::construct): (KJS::JSCallbackObject::callAsFunction): (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSCallbackObject.h:
• API/JSContextRef.cpp: (JSEvaluate):
• API/JSNode.c: (JSNodePrototype_appendChild): (JSNodePrototype_removeChild): (JSNodePrototype_replaceChild):
• API/JSObjectRef.cpp: (JSObjectMake): (JSFunctionMakeWithBody): (JSObjectGetProperty): (JSObjectCallAsFunction): (JSObjectCallAsConstructor):
• API/JSObjectRef.h:
• API/testapi.c: (main):
• ChangeLog:
• kjs/object.h: (KJS::JSObject::JSObject):

File:

• trunk/JavaScriptCore/API/JSNode.c (modified) (3 diffs)

trunk/JavaScriptCore/API/JSNode.c

@@ -49 +49 @@
     } else {
         Node* node = JSObjectGetPrivate(thisObject);
-        Node* child = JSObjectGetPrivate(argv[0]);
+        Node* child = JSObjectGetPrivate(JSValueToObject(context, argv[0]));
 
         Node_appendChild(node, child);
@@ -67 +67 @@
             if (JSValueIsObjectOfClass(argv[0], JSNode_class(context))) {
                 Node* node = JSObjectGetPrivate(thisObject);
-                Node* child = JSObjectGetPrivate(argv[0]);
+                Node* child = JSObjectGetPrivate(JSValueToObject(context, argv[0]));
                 
                 Node_removeChild(node, child);
@@ -87 +87 @@
                 if (JSValueIsObjectOfClass(argv[1], JSNode_class(context))) {
                     Node* node = JSObjectGetPrivate(thisObject);
-                    Node* newChild = JSObjectGetPrivate(argv[0]);
-                    Node* oldChild = JSObjectGetPrivate(argv[1]);
+                    Node* newChild = JSObjectGetPrivate(JSValueToObject(context, argv[0]));
+                    Node* oldChild = JSObjectGetPrivate(JSValueToObject(context, argv[1]));
                     
                     Node_replaceChild(node, newChild, oldChild);