Changeset 15484 in webkit for trunk/JavaScriptCore/API/testapi.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/testapi.c (modified) (10 diffs)

trunk/JavaScriptCore/API/testapi.c

@@ -101 +101 @@
 
 static bool didInitialize = false;
-static void MyObject_initialize(JSContextRef context, JSObjectRef object, JSValueRef* exception)
+static void MyObject_initialize(JSContextRef context, JSObjectRef object)
 {
     UNUSED_PARAM(context);
@@ -291 +291 @@
 }
 
-static void Base_initialize(JSContextRef context, JSObjectRef object, JSValueRef* exception)
+static void Base_initialize(JSContextRef context, JSObjectRef object)
 {
     assert(!JSObjectGetPrivate(object));
@@ -316 +316 @@
 }
 
-static void Derived_initialize(JSContextRef context, JSObjectRef object, JSValueRef* exception)
+static void Derived_initialize(JSContextRef context, JSObjectRef object)
 {
     assert((void*)1 == JSObjectGetPrivate(object));
@@ -362 +362 @@
     UNUSED_PARAM(constructorObject);
     
-    JSObjectRef result = JSObjectMake(context, NULL, 0, NULL);
+    JSObjectRef result = JSObjectMake(context, NULL, NULL);
     if (argumentCount > 0) {
         JSStringRef value = JSStringCreateWithUTF8CString("value");
@@ -391 +391 @@
     JSValueRef jsOne = JSValueMakeNumber(context, 1);
     JSValueRef jsOneThird = JSValueMakeNumber(context, 1.0 / 3.0);
-    JSObjectRef jsObjectNoProto = JSObjectMake(context, NULL, JSValueMakeNull(context), NULL);
+    JSObjectRef jsObjectNoProto = JSObjectMake(context, NULL, JSValueMakeNull(context));
 
     // FIXME: test funny utf8 characters
@@ -445 +445 @@
 #endif // __APPLE__
 
-    JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL, NULL);
+    JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL);
     assert(didInitialize);
     JSStringRef myObjectIString = JSStringCreateWithUTF8CString("MyObject");
@@ -559 +559 @@
 #endif // __APPLE__
     
-    jsGlobalValue = JSObjectMake(context, NULL, NULL, NULL);
+    jsGlobalValue = JSObjectMake(context, NULL, NULL);
     JSValueProtect(context, jsGlobalValue);
     JSGarbageCollect(context);
@@ -667 +667 @@
     assert(!JSObjectGetPrivate(myConstructor));
     
-    o = JSObjectMake(context, NULL, NULL, NULL);
+    o = JSObjectMake(context, NULL, NULL);
     JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(context, 1), kJSPropertyAttributeNone, NULL);
     JSObjectSetProperty(context, o, jsCFIString,  JSValueMakeNumber(context, 1), kJSPropertyAttributeDontEnum, NULL);
@@ -690 +690 @@
     assert(JSValueIsEqual(context, v, o, NULL));
     
-    exception = NULL;
-    o = JSObjectMake(context, Derived_class(context), NULL, &exception);
-    assert(!exception);
+    o = JSObjectMake(context, Derived_class(context), NULL);
     assert(JSObjectGetPrivate(o) == (void*)2);
     o = NULL;
@@ -713 +711 @@
 
     // Allocate a few dummies so that at least one will be collected
-    JSObjectMake(context, MyObject_class(context), NULL, NULL);
-    JSObjectMake(context, MyObject_class(context), NULL, NULL);
+    JSObjectMake(context, MyObject_class(context), NULL);
+    JSObjectMake(context, MyObject_class(context), NULL);
     JSGarbageCollect(context);
     assert(MyObject_didFinalize);