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

Timestamp:

Jul 14, 2008, 4:28:57 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Eliminate per-thread JavaScript global data instance support and make arbitrary
global data/global object combinations possible.

File:

• trunk/JavaScriptCore/API/JSContextRef.cpp (modified) (4 diffs)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -44 +44 @@
     JSLock lock(true);
 
+    JSGlobalData* sharedGlobalData = &JSGlobalData::sharedInstance();
+
     if (!globalObjectClass) {
-        JSGlobalObject* globalObject = new (JSGlobalObject::Shared) JSGlobalObject;
+        JSGlobalObject* globalObject = new (sharedGlobalData) JSGlobalObject;
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
-    JSGlobalObject* globalObject = new (JSGlobalObject::Shared) JSCallbackObject<JSGlobalObject>(globalObjectClass);
+    JSGlobalObject* globalObject = new (sharedGlobalData) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     JSGlobalContextRef ctx = toGlobalRef(globalObject->globalExec());
     JSValue* prototype = globalObjectClass->prototype(ctx);
@@ -61 +63 @@
 {
     ExecState* exec = toJS(ctx);
+    exec->globalData().heap->registerThread();
     JSLock lock(exec);
+
     gcProtect(exec->dynamicGlobalObject());
     return ctx;
@@ -70 +74 @@
     ExecState* exec = toJS(ctx);
     JSLock lock(exec);
+
     gcUnprotect(exec->dynamicGlobalObject());
 }
@@ -76 +81 @@
 {
     ExecState* exec = toJS(ctx);
+    exec->globalData().heap->registerThread();
 
     // It is necessary to call toThisObject to get the wrapper object when used with WebCore.