Changeset 39360 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 17, 2008, 10:10:51 AM (16 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

Don't use unique context group in JSGlobalContextCreate() on Tiger or Leopard, take two.

• API/JSContextRef.cpp: The previous patch that claimed to do this was making Tiger and Leopard always use unique context group instead.

Location:

trunk/JavaScriptCore

Files:

• API/JSContextRef.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -61 +61 @@
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
-#if PLATFORM(DARWIN) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(DARWIN)
+    // When running on Tiger or Leopard, or if the application was linked before JSGlobalContextCreate was changed
+    // to use a unique JSGlobalData, we use a shared one for compatibility.
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
     if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {
+#else
+    {
+#endif
         JSLock lock(true);
         return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
     }
-#endif
+#endif // PLATFORM(DARWIN)
+
     return JSGlobalContextCreateInGroup(0, globalObjectClass);
 }

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-12-17  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        Don't use unique context group in JSGlobalContextCreate() on Tiger or Leopard, take two.
+
+        * API/JSContextRef.cpp: The previous patch that claimed to do this was making Tiger and
+        Leopard always use unique context group instead.
+
 2008-12-16  Sam Weinig  <[email protected]>