Changeset 27885 in webkit for trunk/JavaScriptCore/API/JSContextRef.cpp

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/JSContextRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -32 +32 @@
 
 #include "JSCallbackObject.h"
+#include "JSClassRef.h"
 #include "JSGlobalObject.h"
 #include "completion.h"
@@ -43 +44 @@
     JSLock lock;
 
-    JSGlobalObject* globalObject;
-    if (globalObjectClass)
-        // Specify jsNull() as the prototype.  Interpreter will fix it up to point at builtinObjectPrototype() in its constructor
-        globalObject = new JSCallbackObject<JSGlobalObject>(0, globalObjectClass, jsNull(), 0);
-    else
-        globalObject = new JSGlobalObject();
+    Interpreter* interpreter = new Interpreter();
+    ExecState* globalExec = interpreter->globalExec();
+    JSGlobalContextRef ctx = toGlobalRef(globalExec);
 
-    Interpreter* interpreter = new Interpreter(globalObject); // adds the built-in object prototype to the global object
-    if (globalObjectClass)
-        static_cast<JSCallbackObject<JSGlobalObject>*>(globalObject)->initializeIfNeeded(interpreter->globalExec());
-    JSGlobalContextRef ctx = reinterpret_cast<JSGlobalContextRef>(interpreter->globalExec());
+    if (globalObjectClass) {
+        JSObject* prototype = globalObjectClass->prototype(ctx);
+        JSCallbackObject<JSGlobalObject>* globalObject = new JSCallbackObject<JSGlobalObject>(globalObjectClass, prototype ? prototype : jsNull(), 0);
+        interpreter->setGlobalObject(globalObject);
+        globalObject->init(globalExec);
+    } else
+        interpreter->setGlobalObject(new JSGlobalObject());
+
     return JSGlobalContextRetain(ctx);
 }