JavaScriptCore-576.tar.gz

[apple/javascriptcore.git] / API / JSContextRef.cpp

diff --git a/API/JSContextRef.cpp b/API/JSContextRef.cpp
index c331179ec71070d533c63bf79e600b28a4f1bfc9..2c763387666f0f0127557edc2d62255ba093aaba 100644 (file)
--- a/API/JSContextRef.cpp
+++ b/API/JSContextRef.cpp
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "JSContextRef.h"
 
 #include "config.h"
 #include "JSContextRef.h"

+#include "JSContextRefPrivate.h"

 
 #include "APICast.h"
 #include "InitializeThreading.h"
 
 #include "APICast.h"
 #include "InitializeThreading.h"


@@ -34,7 +35,7 @@
 #include "JSObject.h"
 #include <wtf/Platform.h>
 
 #include "JSObject.h"
 #include <wtf/Platform.h>
 

-#if PLATFORM(DARWIN)
+#if OS(DARWIN)

 #include <mach-o/dyld.h>
 
 static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500; // 528.5.0
 #include <mach-o/dyld.h>
 
 static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500; // 528.5.0


@@ -45,7 +46,7 @@ using namespace JSC;
 JSContextGroupRef JSContextGroupCreate()
 {
     initializeThreading();
 JSContextGroupRef JSContextGroupCreate()
 {
     initializeThreading();

-    return toRef(JSGlobalData::create().releaseRef());
+    return toRef(JSGlobalData::createNonDefault().releaseRef());

 }
 
 JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)
 }
 
 JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)


@@ -62,7 +63,7 @@ void JSContextGroupRelease(JSContextGroupRef group)
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
     initializeThreading();
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
     initializeThreading();

-#if PLATFORM(DARWIN)
+#if OS(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)
     // 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)


@@ -70,10 +71,10 @@ JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 #else
     {
 #endif
 #else
     {
 #endif

-        JSLock lock(true);
+        JSLock lock(LockForReal);

         return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
     }
         return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
     }

-#endif // PLATFORM(DARWIN)
+#endif // OS(DARWIN)

 
     return JSGlobalContextCreateInGroup(0, globalObjectClass);
 }
 
     return JSGlobalContextCreateInGroup(0, globalObjectClass);
 }


@@ -82,9 +83,10 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass
 {
     initializeThreading();
 
 {
     initializeThreading();
 

-    JSLock lock(true);
+    JSLock lock(LockForReal);
+    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::createNonDefault();

 
 

-    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::create();
+    APIEntryShim entryShim(globalData.get(), false);

 
 #if ENABLE(JSC_MULTIPLE_THREADS)
     globalData->makeUsableFromMultipleThreads();
 
 #if ENABLE(JSC_MULTIPLE_THREADS)
     globalData->makeUsableFromMultipleThreads();


@@ -97,7 +99,7 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass
 
     JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     ExecState* exec = globalObject->globalExec();
 
     JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     ExecState* exec = globalObject->globalExec();

-    JSValuePtr prototype = globalObjectClass->prototype(exec);
+    JSValue prototype = globalObjectClass->prototype(exec);

     if (!prototype)
         prototype = jsNull();
     globalObject->resetPrototype(prototype);
     if (!prototype)
         prototype = jsNull();
     globalObject->resetPrototype(prototype);


@@ -107,12 +109,9 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass
 JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {
     ExecState* exec = toJS(ctx);
 JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {
     ExecState* exec = toJS(ctx);

-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     JSGlobalData& globalData = exec->globalData();
 
     JSGlobalData& globalData = exec->globalData();

-
-    globalData.heap.registerThread();
-

     gcProtect(exec->dynamicGlobalObject());
     globalData.ref();
     return ctx;
     gcProtect(exec->dynamicGlobalObject());
     globalData.ref();
     return ctx;


@@ -123,25 +122,26 @@ void JSGlobalContextRelease(JSGlobalContextRef ctx)
     ExecState* exec = toJS(ctx);
     JSLock lock(exec);
 
     ExecState* exec = toJS(ctx);
     JSLock lock(exec);
 

+    JSGlobalData& globalData = exec->globalData();
+    IdentifierTable* savedIdentifierTable = setCurrentIdentifierTable(globalData.identifierTable);
+

     gcUnprotect(exec->dynamicGlobalObject());
 
     gcUnprotect(exec->dynamicGlobalObject());
 

-    JSGlobalData& globalData = exec->globalData();

     if (globalData.refCount() == 2) { // One reference is held by JSGlobalObject, another added by JSGlobalContextRetain().
         // The last reference was released, this is our last chance to collect.
     if (globalData.refCount() == 2) { // One reference is held by JSGlobalObject, another added by JSGlobalContextRetain().
         // The last reference was released, this is our last chance to collect.

-        ASSERT(!globalData.heap.protectedObjectCount());
-        ASSERT(!globalData.heap.isBusy());

         globalData.heap.destroy();
     } else
         globalData.heap.destroy();
     } else

-        globalData.heap.collect();
+        globalData.heap.collectAllGarbage();

 
     globalData.deref();
 
     globalData.deref();

+
+    setCurrentIdentifierTable(savedIdentifierTable);

 }
 
 JSObjectRef JSContextGetGlobalObject(JSContextRef ctx)
 {
     ExecState* exec = toJS(ctx);
 }
 
 JSObjectRef JSContextGetGlobalObject(JSContextRef ctx)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     // It is necessary to call toThisObject to get the wrapper object when used with WebCore.
     return toRef(exec->lexicalGlobalObject()->toThisObject(exec));
 
     // It is necessary to call toThisObject to get the wrapper object when used with WebCore.
     return toRef(exec->lexicalGlobalObject()->toThisObject(exec));


@@ -152,3 +152,11 @@ JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
     ExecState* exec = toJS(ctx);
     return toRef(&exec->globalData());
 }
     ExecState* exec = toJS(ctx);
     return toRef(&exec->globalData());
 }

+
+JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx)
+{
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toGlobalRef(exec->lexicalGlobalObject()->globalExec());
+}