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

Timestamp:

Dec 8, 2008, 10:46:39 PM (16 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

<rdar://problem/6166088> Give JSGlobalContextCreate a behavior that is concurrency aware,
and un-deprecate it

• API/JSContextRef.cpp: (JSGlobalContextCreate):
• API/JSContextRef.h: Use a unique context group for the context, unless the application was linked against old JavaScriptCore.

File:

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

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -35 +35 @@
 #include <wtf/Platform.h>
 
+#if PLATFORM(DARWIN)
+#include <mach-o/dyld.h>
+
+static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500; // 528.5.0
+#endif
+
 using namespace JSC;
 
@@ -55 +61 @@
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
-    JSLock lock(true);
-    return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
+#if PLATFORM(DARWIN)
+    if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {
+        JSLock lock(true);
+        return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
+    }
+#endif
+    return JSGlobalContextCreateInGroup(0, globalObjectClass);
 }