<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163590] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163590">163590</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-06 17:56:45 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>+[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContexth">trunk/Source/JavaScriptCore/API/JSContext.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContextmm">trunk/Source/JavaScriptCore/API/JSContext.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContextInternalh">trunk/Source/JavaScriptCore/API/JSContextInternal.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm">trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapimm">trunk/Source/JavaScriptCore/API/tests/testapi.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContext.h (163589 => 163590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContext.h 2014-02-07 01:55:24 UTC (rev 163589)
+++ trunk/Source/JavaScriptCore/API/JSContext.h 2014-02-07 01:56:45 UTC (rev 163590)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define JSContext_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><ins>+#include <JavaScriptCore/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #if JSC_OBJC_API_ENABLED
</span><span class="cx">
</span><span class="lines">@@ -94,6 +95,24 @@
</span><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method
</span><ins>+@abstract Get the JavaScript function that is currently executing.
+@discussion This method may be called from within an Objective-C block or method invoked
+ as a callback from JavaScript to retrieve the callback's context. Outside of
+ a callback from JavaScript this method will return nil.
+@result The currently executing JavaScript function or nil if there isn't one.
+*/
+#if TARGET_OS_IPHONE || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
++ (JSValue *)currentCallee NS_AVAILABLE(10_10, 8_0);
+#else
+#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
++ (JSValue *)currentCallee __attribute__((availability(macosx,__NSi_10_10)));
+#else
++ (JSValue *)currentCallee __attribute__((availability(ios,__NSi_8_0)));
+#endif
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+
+/*!
+@method
</ins><span class="cx"> @abstract Get the <code>this</code> value of the currently executing method.
</span><span class="cx"> @discussion This method may be called from within an Objective-C block or method invoked
</span><span class="cx"> as a callback from JavaScript to retrieve the callback's this value. Outside
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContext.mm (163589 => 163590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContext.mm 2014-02-07 01:55:24 UTC (rev 163589)
+++ trunk/Source/JavaScriptCore/API/JSContext.mm 2014-02-07 01:56:45 UTC (rev 163590)
</span><span class="lines">@@ -141,6 +141,15 @@
</span><span class="cx"> return [JSValue valueWithJSValueRef:entry->thisValue inContext:[JSContext currentContext]];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (JSValue *)currentCallee
+{
+ WTFThreadData& threadData = wtfThreadData();
+ CallbackData *entry = (CallbackData *)threadData.m_apiData;
+ if (!entry)
+ return nil;
+ return [JSValue valueWithJSValueRef:entry->calleeValue inContext:[JSContext currentContext]];
+}
+
</ins><span class="cx"> + (NSArray *)currentArguments
</span><span class="cx"> {
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="lines">@@ -238,12 +247,12 @@
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)beginCallbackWithData:(CallbackData *)callbackData thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments
</del><ins>+- (void)beginCallbackWithData:(CallbackData *)callbackData calleeValue:(JSValueRef)calleeValue thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments
</ins><span class="cx"> {
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="cx"> [self retain];
</span><span class="cx"> CallbackData *prevStack = (CallbackData *)threadData.m_apiData;
</span><del>- *callbackData = (CallbackData){ prevStack, self, [self.exception retain], thisValue, argumentCount, arguments, nil };
</del><ins>+ *callbackData = (CallbackData){ prevStack, self, [self.exception retain], calleeValue, thisValue, argumentCount, arguments, nil };
</ins><span class="cx"> threadData.m_apiData = callbackData;
</span><span class="cx"> self.exception = nil;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSContextInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContextInternal.h (163589 => 163590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContextInternal.h 2014-02-07 01:55:24 UTC (rev 163589)
+++ trunk/Source/JavaScriptCore/API/JSContextInternal.h 2014-02-07 01:56:45 UTC (rev 163590)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> CallbackData *next;
</span><span class="cx"> JSContext *context;
</span><span class="cx"> JSValue *preservedException;
</span><ins>+ JSValueRef calleeValue;
</ins><span class="cx"> JSValueRef thisValue;
</span><span class="cx"> size_t argumentCount;
</span><span class="cx"> const JSValueRef *arguments;
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> - (JSValue *)valueFromNotifyException:(JSValueRef)exception;
</span><span class="cx"> - (BOOL)boolFromNotifyException:(JSValueRef)exception;
</span><span class="cx">
</span><del>-- (void)beginCallbackWithData:(CallbackData *)callbackData thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments;
</del><ins>+- (void)beginCallbackWithData:(CallbackData *)callbackData calleeValue:(JSValueRef)calleeValue thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments;
</ins><span class="cx"> - (void)endCallbackWithData:(CallbackData *)callbackData;
</span><span class="cx">
</span><span class="cx"> - (JSValue *)wrapperForObjCObject:(id)object;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (163589 => 163590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2014-02-07 01:55:24 UTC (rev 163589)
+++ trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2014-02-07 01:56:45 UTC (rev 163590)
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> CallbackData callbackData;
</span><span class="cx"> JSValueRef result;
</span><span class="cx"> @autoreleasepool {
</span><del>- [context beginCallbackWithData:&callbackData thisValue:thisObject argumentCount:argumentCount arguments:arguments];
</del><ins>+ [context beginCallbackWithData:&callbackData calleeValue:function thisValue:thisObject argumentCount:argumentCount arguments:arguments];
</ins><span class="cx"> result = impl->call(context, thisObject, argumentCount, arguments, exception);
</span><span class="cx"> if (context.exception)
</span><span class="cx"> *exception = valueInternalValue(context.exception);
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> CallbackData callbackData;
</span><span class="cx"> JSValueRef result;
</span><span class="cx"> @autoreleasepool {
</span><del>- [context beginCallbackWithData:&callbackData thisValue:nil argumentCount:argumentCount arguments:arguments];
</del><ins>+ [context beginCallbackWithData:&callbackData calleeValue:constructor thisValue:nil argumentCount:argumentCount arguments:arguments];
</ins><span class="cx"> result = impl->call(context, NULL, argumentCount, arguments, exception);
</span><span class="cx"> if (context.exception)
</span><span class="cx"> *exception = valueInternalValue(context.exception);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapimm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.mm (163589 => 163590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.mm 2014-02-07 01:55:24 UTC (rev 163589)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.mm 2014-02-07 01:56:45 UTC (rev 163590)
</span><span class="lines">@@ -1141,8 +1141,30 @@
</span><span class="cx"> @autoreleasepool {
</span><span class="cx"> checkResult(@"[JSContext currentThis] == nil outside of callback", ![JSContext currentThis]);
</span><span class="cx"> checkResult(@"[JSContext currentArguments] == nil outside of callback", ![JSContext currentArguments]);
</span><ins>+ if ([JSContext currentCallee])
+ checkResult(@"[JSContext currentCallee] == nil outside of callback", ![JSContext currentCallee]);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ([JSContext currentCallee]) {
+ @autoreleasepool {
+ JSContext *context = [[JSContext alloc] init];
+ context[@"testFunction"] = ^{
+ checkResult(@"testFunction.foo === 42", [[JSContext currentCallee][@"foo"] toInt32] == 42);
+ };
+ context[@"testFunction"][@"foo"] = @42;
+ [context[@"testFunction"] callWithArguments:nil];
+
+ context[@"TestConstructor"] = ^{
+ JSValue *newThis = [JSValue valueWithNewObjectInContext:[JSContext currentContext]];
+ JSGlobalContextRef contextRef = [[JSContext currentContext] JSGlobalContextRef];
+ JSObjectRef newThisRef = JSValueToObject(contextRef, [newThis JSValueRef], NULL);
+ JSObjectSetPrototype(contextRef, newThisRef, [[JSContext currentCallee][@"prototype"] JSValueRef]);
+ return newThis;
+ };
+ checkResult(@"(new TestConstructor) instanceof TestConstructor", [context evaluateScript:@"(new TestConstructor) instanceof TestConstructor"]);
+ }
+ }
+
</ins><span class="cx"> @autoreleasepool {
</span><span class="cx"> JSContext *context = [[JSContext alloc] init];
</span><span class="cx"> context[@"TestObject"] = [TestObject class];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163589 => 163590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-07 01:55:24 UTC (rev 163589)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-07 01:56:45 UTC (rev 163590)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-02-06 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><ins>+ +[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:
+
+2014-02-06 Mark Hahnenberg <mhahnenberg@apple.com>
+
</ins><span class="cx"> Fix iOS builds after r163574
</span><span class="cx">
</span><span class="cx"> * API/JSManagedValue.h:
</span></span></pre>
</div>
</div>
</body>
</html>