Changeset 163590 in webkit for trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm

Timestamp:

Feb 6, 2014, 5:56:45 PM (11 years ago)

Author:

[email protected]

Message:

+[JSContext currentCallee] should return the currently executing JS function
​https://bugs.webkit.org/show_bug.cgi?id=122621

Reviewed by Geoffrey Garen.

It would be useful if there was a +[JSContext currentObject] API which was
callable from ObjC API callbacks. Its purpose would be to allow convenient
access to the JSValue wrapper for the currently-executing block callback.

• API/JSContext.h:
• API/JSContext.mm:

(+[JSContext currentCallee]):
(-[JSContext beginCallbackWithData:calleeValue:thisValue:argumentCount:arguments:]):

• API/JSContextInternal.h:
• API/ObjCCallbackFunction.mm:

(JSC::objCCallbackFunctionCallAsFunction):
(JSC::objCCallbackFunctionCallAsConstructor):

• API/tests/testapi.mm:

File:

• trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm

@@ -465 +465 @@
     JSValueRef result;
     @autoreleasepool {
-        [context beginCallbackWithData:&callbackData thisValue:thisObject argumentCount:argumentCount arguments:arguments];
+        [context beginCallbackWithData:&callbackData calleeValue:function thisValue:thisObject argumentCount:argumentCount arguments:arguments];
         result = impl->call(context, thisObject, argumentCount, arguments, exception);
         if (context.exception)
@@ -485 +485 @@
     JSValueRef result;
     @autoreleasepool {
-        [context beginCallbackWithData:&callbackData thisValue:nil argumentCount:argumentCount arguments:arguments];
+        [context beginCallbackWithData:&callbackData calleeValue:constructor thisValue:nil argumentCount:argumentCount arguments:arguments];
         result = impl->call(context, NULL, argumentCount, arguments, exception);
         if (context.exception)