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

Timestamp:

Jul 17, 2006, 2:06:57 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Changed the initialize callback to run from least derived class (parent class) to most derived class. This enables C++ style initialization, and derived class overriding of member data.

• Added excpetion propopgation to JSObjectMake, to support initialize exceptions, and generally round out our policy of making function signatures as long as possible.

• API/JSCallbackObject.h: Use ExecState instead of ContextRef, cuz we're in C++ land now.

File:

• trunk/JavaScriptCore/API/JSCallbackObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -38 +38 @@
 const ClassInfo JSCallbackObject::info = { "CallbackObject", 0, 0, 0 };
 
-JSCallbackObject::JSCallbackObject(JSContextRef ctx, JSClassRef jsClass)
+JSCallbackObject::JSCallbackObject(ExecState* exec, JSClassRef jsClass)
     : JSObject()
 {
-    init(ctx, jsClass);
-}
-
-JSCallbackObject::JSCallbackObject(JSContextRef ctx, JSClassRef jsClass, JSValue* prototype)
+    init(exec, jsClass);
+}
+
+JSCallbackObject::JSCallbackObject(ExecState* exec, JSClassRef jsClass, JSValue* prototype)
     : JSObject(prototype)
 {
-    init(ctx, jsClass);
-}
-
-void JSCallbackObject::init(JSContextRef ctx, JSClassRef jsClass)
-{
-    ExecState* exec = toJS(ctx);
-    
+    init(exec, jsClass);
+}
+
+void JSCallbackObject::init(ExecState* exec, JSClassRef jsClass)
+{
     m_privateData = 0;
     m_class = JSClassRetain(jsClass);
 
-    JSObjectRef thisRef = toRef(this);
-    
+    Vector<JSObjectInitializeCallback, 16> initRoutines;
     do {
         if (JSObjectInitializeCallback initialize = jsClass->initialize)
-            initialize(ctx, thisRef, toRef(exec->exceptionSlot()));
+            initRoutines.append(initialize);
     } while ((jsClass = jsClass->parentClass));
+    
+    // initialize from base to derived
+    for (int i = initRoutines.size() - 1; i >= 0; i--) {
+        JSObjectInitializeCallback initialize = initRoutines[i];
+        initialize(toRef(exec), toRef(this), toRef(exec->exceptionSlot()));
+    }
 }