Changeset 49802 in webkit for trunk/JavaScriptCore/API

Timestamp:

Oct 19, 2009, 12:59:32 PM (16 years ago)

Author:

[email protected]

Message:

Added a private API for getting a global context from a context, for
clients who want to preserve a context for a later callback.

Patch by Geoffrey Garen <​[email protected]> on 2009-10-19
Reviewed by Sam Weinig.

• API/APICast.h:

(toGlobalRef): Added an ASSERT, since this function is used more often
than before.

• API/JSContextRef.cpp:
• API/JSContextRefPrivate.h: Added. The new API.

• API/tests/testapi.c:

(print_callAsFunction):
(main): Test the new API.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj: Build and export the new API.

Location:

trunk/JavaScriptCore/API

Files:

• APICast.h (modified) (2 diffs)
• JSContextRef.cpp (modified) (2 diffs)
• JSContextRefPrivate.h (added)
• tests/testapi.c (modified) (5 diffs)

trunk/JavaScriptCore/API/APICast.h

@@ -28 +28 @@
 
 #include "JSAPIValueWrapper.h"
+#include "JSGlobalObject.h"
 #include "JSValue.h"
 #include <wtf/Platform.h>
@@ -119 +120 @@
 inline JSGlobalContextRef toGlobalRef(JSC::ExecState* e)
 {
+    ASSERT(e == e->lexicalGlobalObject()->globalExec());
     return reinterpret_cast<JSGlobalContextRef>(e);
 }

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "JSContextRef.h"
+#include "JSContextRefPrivate.h"
 
 #include "APICast.h"
@@ -153 +154 @@
     return toRef(&exec->globalData());
 }
+
+JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx)
+{
+    ExecState* exec = toJS(ctx);
+    exec->globalData().heap.registerThread();
+    JSLock lock(exec);
+
+    return toGlobalRef(exec->lexicalGlobalObject()->globalExec());
+}

trunk/JavaScriptCore/API/tests/testapi.c

@@ -26 +26 @@
 #include "JavaScriptCore.h"
 #include "JSBasePrivate.h"
+#include "JSContextRefPrivate.h"
 #include <math.h>
 #define ASSERT_DISABLED 0
@@ -42 +43 @@
 #endif
 
-static JSGlobalContextRef context = 0;
-static int failed = 0;
+static JSGlobalContextRef context;
+static int failed;
 static void assertEqualsAsBoolean(JSValueRef value, bool expectedValue)
 {
@@ -619 +620 @@
 }
 
-static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+static JSValueRef print_callAsFunction(JSContextRef ctx, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(functionObject);
     UNUSED_PARAM(thisObject);
     UNUSED_PARAM(exception);
+
+    ASSERT(JSContextGetGlobalContext(ctx) == context);
     
     if (argumentCount > 0) {
-        JSStringRef string = JSValueToStringCopy(context, arguments[0], NULL);
+        JSStringRef string = JSValueToStringCopy(ctx, arguments[0], NULL);
         size_t sizeUTF8 = JSStringGetMaximumUTF8CStringSize(string);
         char* stringUTF8 = (char*)malloc(sizeUTF8);
@@ -635 +638 @@
     }
     
-    return JSValueMakeUndefined(context);
+    return JSValueMakeUndefined(ctx);
 }
 
@@ -761 +764 @@
     JSGlobalContextRetain(context);
     JSGlobalContextRelease(context);
+    ASSERT(JSContextGetGlobalContext(context) == context);
     
     JSReportExtraMemoryCost(context, 0);