JavaScriptCore-576.tar.gz

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

diff --git a/API/JSContextRef.cpp b/API/JSContextRef.cpp
index 203326e251f64e51f5364495abc115796e31970b..2c763387666f0f0127557edc2d62255ba093aaba 100644 (file)
--- a/API/JSContextRef.cpp
+++ b/API/JSContextRef.cpp
@@ -1,4 +1,3 @@
-// -*- mode: c++; c-basic-offset: 4 -*-

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *


@@ -26,51 +25,138 @@
 
 #include "config.h"
 #include "JSContextRef.h"
 
 #include "config.h"
 #include "JSContextRef.h"

+#include "JSContextRefPrivate.h"

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

+#include "InitializeThreading.h"

 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
 #include "JSGlobalObject.h"
 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
 #include "JSGlobalObject.h"

-#include "object.h"
+#include "JSObject.h"

 #include <wtf/Platform.h>
 
 #include <wtf/Platform.h>
 

-using namespace KJS;
+#if OS(DARWIN)
+#include <mach-o/dyld.h>
+
+static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500; // 528.5.0
+#endif
+
+using namespace JSC;
+
+JSContextGroupRef JSContextGroupCreate()
+{
+    initializeThreading();
+    return toRef(JSGlobalData::createNonDefault().releaseRef());
+}
+
+JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)
+{
+    toJS(group)->ref();
+    return group;
+}
+
+void JSContextGroupRelease(JSContextGroupRef group)
+{
+    toJS(group)->deref();
+}

 
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
 
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {

-    JSLock lock;
+    initializeThreading();
+#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)
+    if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {
+#else
+    {
+#endif
+        JSLock lock(LockForReal);
+        return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
+    }
+#endif // OS(DARWIN)
+
+    return JSGlobalContextCreateInGroup(0, globalObjectClass);
+}
+
+JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass)
+{
+    initializeThreading();
+
+    JSLock lock(LockForReal);
+    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::createNonDefault();
+
+    APIEntryShim entryShim(globalData.get(), false);
+
+#if ENABLE(JSC_MULTIPLE_THREADS)
+    globalData->makeUsableFromMultipleThreads();
+#endif

 
     if (!globalObjectClass) {
 
     if (!globalObjectClass) {

-        JSGlobalObject* globalObject = new JSGlobalObject;
+        JSGlobalObject* globalObject = new (globalData.get()) JSGlobalObject;

         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 

-    JSGlobalObject* globalObject = new JSCallbackObject<JSGlobalObject>(globalObjectClass);
-    JSGlobalContextRef ctx = toGlobalRef(globalObject->globalExec());
-    JSValue* prototype = globalObjectClass->prototype(ctx);
+    JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
+    ExecState* exec = globalObject->globalExec();
+    JSValue prototype = globalObjectClass->prototype(exec);

     if (!prototype)
         prototype = jsNull();
     if (!prototype)
         prototype = jsNull();

-    globalObject->reset(prototype);
-    return JSGlobalContextRetain(ctx);
+    globalObject->resetPrototype(prototype);
+    return JSGlobalContextRetain(toGlobalRef(exec));

 }
 
 JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {
 }
 
 JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {

-    JSLock lock;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

+    APIEntryShim entryShim(exec);
+
+    JSGlobalData& globalData = exec->globalData();

     gcProtect(exec->dynamicGlobalObject());
     gcProtect(exec->dynamicGlobalObject());

+    globalData.ref();

     return ctx;
 }
 
 void JSGlobalContextRelease(JSGlobalContextRef ctx)
 {
     return ctx;
 }
 
 void JSGlobalContextRelease(JSGlobalContextRef ctx)
 {

-    JSLock lock;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

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

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

+
+    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.
+        globalData.heap.destroy();
+    } else
+        globalData.heap.collectAllGarbage();
+
+    globalData.deref();
+
+    setCurrentIdentifierTable(savedIdentifierTable);

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

-    return toRef(exec->dynamicGlobalObject());
+    APIEntryShim entryShim(exec);
+
+    // It is necessary to call toThisObject to get the wrapper object when used with WebCore.
+    return toRef(exec->lexicalGlobalObject()->toThisObject(exec));
+}
+
+JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
+{
+    ExecState* exec = toJS(ctx);
+    return toRef(&exec->globalData());
+}
+
+JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx)
+{
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toGlobalRef(exec->lexicalGlobalObject()->globalExec());

 }
 }