Changeset 27885 in webkit for trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

Timestamp:

Nov 18, 2007, 1:09:27 AM (18 years ago)

Author:

[email protected]

Message:

Fix: <rdar://problem/5607032> (REGRESSION: testapi exits with assertion failure in debug build) and <rdar://problem/5440659> (JSGlobalContextCreate throws away globalObjectClass's prototype)

Split Interpreter's initialization into two distinct steps: the creation of the global prototypes
and constructors, and storing them on the global object. This allows JSClassRef's passed to
JSGlobalContextCreate to be instantiated with the correct prototype.

Reviewed by Darin Adler.

File:

• trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (3 diffs)

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -42 +42 @@
 JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSClassRef jsClass, JSValue* prototype, void* data)
     : Base(prototype)
-    , m_class(0)
-    , m_isInitialized(false)
-{
-    init(exec, jsClass, data);
-}
-
-template <class Base>
-void JSCallbackObject<Base>::init(ExecState* exec, JSClassRef jsClass, void* data)
-{
-    m_privateData = data;
-    JSClassRef oldClass = m_class;
-    m_class = JSClassRetain(jsClass);
-    if (oldClass)
-        JSClassRelease(oldClass);
-    
-    if (!exec)
-        return;
+    , m_privateData(data)
+    , m_class(JSClassRetain(jsClass))
+{
+    init(exec);
+}
+
+template <class Base>
+JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass, JSValue* prototype, void* data)
+    : Base(prototype)
+    , m_privateData(data)
+    , m_class(JSClassRetain(jsClass))
+{
+}
+
+template <class Base>
+void JSCallbackObject<Base>::init(ExecState* exec)
+{
+    ASSERT(exec);
     
     Vector<JSObjectInitializeCallback, 16> initRoutines;
+    JSClassRef jsClass = m_class;
     do {
         if (JSObjectInitializeCallback initialize = jsClass->initialize)
@@ -72 +74 @@
         initialize(toRef(exec), toRef(this));
     }
-    m_isInitialized = true;
 }
 
@@ -86 +87 @@
             
     JSClassRelease(m_class);
-}
-
-template <class Base>
-void JSCallbackObject<Base>::initializeIfNeeded(ExecState* exec)
-{
-    if (m_isInitialized)
-        return;
-    init(exec, m_class, m_privateData);
 }