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

Timestamp:

Jul 17, 2006, 3:49:28 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Removed the exception parameter from the initialize callback and, by extension, JSObjectMake. We have never had a need for exceptions when iniitializing, so the parameter seemed likely to "get in the way."

Also, an exception in JavaScript is thrown in response to input --
"invalid URL", "index not a number", etc., so it's the job of the
constructor function, not the initialize method, to throw.

If initialize *really* wants to throw, it can communicate the throw to
the constructor through the constructed object's private data (e.g., set
it to NULL, signaling to the consntructor that initialization failed.)

• Added JSObjectMakeWithData, which enables a constructor to set private data on an object *before* it has been initialized. That way, the initialize methods can properly operate on the data.

• API/JSNode.c: Moved ref into the initialize method, for better encapsulation, now that it's possible.
• API/JSNodeList.c: ditto
• API/minidom.c: (main): Do more aggressive garbage collection to test ref/deref and initialize/finalize.
• API/minidom.js: store childNodes in a temporary so it doesn't get re-created like a thousand times. This makes debugging ref/deref easier

File:

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

trunk/JavaScriptCore/API/JSNode.c

@@ -157 +157 @@
 };
 
+static void JSNode_initialize(JSContextRef context, JSObjectRef object)
+{
+    Node* node = JSObjectGetPrivate(object);
+    assert(node);
+
+    Node_ref(node);
+}
+
 static void JSNode_finalize(JSObjectRef object)
 {
@@ -171 +179 @@
         JSClassDefinition definition = kJSClassDefinitionNull;
         definition.staticValues = JSNode_staticValues;
+        definition.initialize = JSNode_initialize;
         definition.finalize = JSNode_finalize;
 
@@ -182 +191 @@
     static JSObjectRef prototype;
     if (!prototype) {
-        prototype = JSObjectMake(context, JSNodePrototype_class(context), NULL, NULL);
+        prototype = JSObjectMake(context, JSNodePrototype_class(context), NULL);
         JSValueProtect(context, prototype);
     }
@@ -190 +199 @@
 JSObjectRef JSNode_new(JSContextRef context, Node* node)
 {
-    Node_ref(node);
-
-    JSObjectRef jsNode = JSObjectMake(context, JSNode_class(context), JSNode_prototype(context), NULL);
-    JSObjectSetPrivate(jsNode, node);
-    return jsNode;
+    return JSObjectMakeWithData(context, JSNode_class(context), JSNode_prototype(context), node);
 }