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

Timestamp:

Aug 20, 2008, 12:23:06 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Bring back shared JSGlobalData and implicit locking, because too many clients rely on it.

File:

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

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -56 +56 @@
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
-    return JSGlobalContextCreateInGroup(toRef(JSGlobalData::create().get()), globalObjectClass);
+    JSLock lock(true);
+    return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
 }
 
@@ -63 +64 @@
     initializeThreading();
 
-    JSGlobalData* globalData = toJS(group);
+    JSLock lock(true);
+
+    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::create();
 
     if (!globalObjectClass) {
-        JSGlobalObject* globalObject = new (globalData) JSGlobalObject;
+        JSGlobalObject* globalObject = new (globalData.get()) JSGlobalObject;
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
-    JSGlobalObject* globalObject = new (globalData) JSCallbackObject<JSGlobalObject>(globalObjectClass);
+    JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     ExecState* exec = globalObject->globalExec();
     JSValue* prototype = globalObjectClass->prototype(exec);
@@ -82 +85 @@
 {
     ExecState* exec = toJS(ctx);
+    JSLock lock(exec);
+
     JSGlobalData& globalData = exec->globalData();
 
@@ -94 +99 @@
 {
     ExecState* exec = toJS(ctx);
+    JSLock lock(exec);
 
     gcUnprotect(exec->dynamicGlobalObject());
@@ -116 +122 @@
     ExecState* exec = toJS(ctx);
     exec->globalData().heap->registerThread();
+    JSLock lock(exec);
 
     // It is necessary to call toThisObject to get the wrapper object when used with WebCore.