<!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>[196243] trunk</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/196243">196243</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-07 15:16:20 -0800 (Sun, 07 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/JavaScriptCore:
Follow up patch to: [ES6] bound functions .name property should be "bound " + the target function's name
https://bugs.webkit.org/show_bug.cgi?id=153796
Reviewed by Darin Adler.
This follow-up patch addresses some comments/suggestions by
Ryosuke, Darin, and Joe. It simplifies JSBoundFunction::toStringName
and adds some tests for bound names.
* runtime/JSBoundFunction.cpp:
(JSC::hasInstanceBoundFunction):
(JSC::JSBoundFunction::create):
(JSC::JSBoundFunction::toStringName):
LayoutTests:
[ES6] bound functions .name property should be "bound " + the target function's name
https://bugs.webkit.org/show_bug.cgi?id=153796
Reviewed by Darin Adler.
* js/bound-function-name-expected.txt: Added.
* js/bound-function-name.html: Added.
* js/script-tests/bound-function-name.js: Added.
(assert):
(assert.foo):
(bar):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsboundfunctionnameexpectedtxt">trunk/LayoutTests/js/bound-function-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsboundfunctionnamehtml">trunk/LayoutTests/js/bound-function-name.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsboundfunctionnamejs">trunk/LayoutTests/js/script-tests/bound-function-name.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196242 => 196243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-07 22:26:46 UTC (rev 196242)
+++ trunk/LayoutTests/ChangeLog 2016-02-07 23:16:20 UTC (rev 196243)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-07 Saam barati <sbarati@apple.com>
+
+ [ES6] bound functions .name property should be "bound " + the target function's name
+ https://bugs.webkit.org/show_bug.cgi?id=153796
+
+ Reviewed by Darin Adler.
+
+ * js/bound-function-name-expected.txt: Added.
+ * js/bound-function-name.html: Added.
+ * js/script-tests/bound-function-name.js: Added.
+ (assert):
+ (assert.foo):
+ (bar):
+
</ins><span class="cx"> 2016-02-07 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Allow Web Workers initiated from an isolated world to bypass the main world Content Security Policy
</span></span></pre></div>
<a id="trunkLayoutTestsjsboundfunctionnameexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/bound-function-name-expected.txt (0 => 196243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/bound-function-name-expected.txt (rev 0)
+++ trunk/LayoutTests/js/bound-function-name-expected.txt 2016-02-07 23:16:20 UTC (rev 196243)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Bound Function Names
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Anonymous function bound name.
+PASS Function bound name should be foo.
+PASS Function bound name should be bar.
+PASS Function double bound name should be bar.
+Test InternalFunction names.
+PASS Function bound name should be Error.
+PASS Function bound name should be Function.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsboundfunctionnamehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/bound-function-name.html (0 => 196243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/bound-function-name.html (rev 0)
+++ trunk/LayoutTests/js/bound-function-name.html 2016-02-07 23:16:20 UTC (rev 196243)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/bound-function-name.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsboundfunctionnamejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/bound-function-name.js (0 => 196243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/bound-function-name.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/bound-function-name.js 2016-02-07 23:16:20 UTC (rev 196243)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+description("Bound Function Names");
+
+function assert(b, text) {
+ if (b)
+ testPassed(text);
+ else
+ testFailed(`Bad result: ${text}`);
+
+}
+assert((function() {}).bind().name === "bound ", "Anonymous function bound name.");
+assert((function foo() {}).bind().name === "bound foo", "Function bound name should be foo.");
+
+function bar() { }
+assert(bar.bind().name === "bound bar", "Function bound name should be bar.");
+assert(bar.bind().bind().name === "bound bound bar", "Function double bound name should be bar.");
+
+debug("Test InternalFunction names.");
+assert(Error.bind().name === "bound Error", "Function bound name should be Error.");
+assert(Function.bind().name === "bound Function", "Function bound name should be Function.");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196242 => 196243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-07 22:26:46 UTC (rev 196242)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-07 23:16:20 UTC (rev 196243)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-07 Saam barati <sbarati@apple.com>
+
+ Follow up patch to: [ES6] bound functions .name property should be "bound " + the target function's name
+ https://bugs.webkit.org/show_bug.cgi?id=153796
+
+ Reviewed by Darin Adler.
+
+ This follow-up patch addresses some comments/suggestions by
+ Ryosuke, Darin, and Joe. It simplifies JSBoundFunction::toStringName
+ and adds some tests for bound names.
+
+ * runtime/JSBoundFunction.cpp:
+ (JSC::hasInstanceBoundFunction):
+ (JSC::JSBoundFunction::create):
+ (JSC::JSBoundFunction::toStringName):
+
</ins><span class="cx"> 2016-02-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> String.match should defend against matches that would crash the VM
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp (196242 => 196243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp 2016-02-07 22:26:46 UTC (rev 196242)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp 2016-02-07 23:16:20 UTC (rev 196243)
</span><span class="lines">@@ -87,8 +87,6 @@
</span><span class="cx"> return JSValue::encode(jsBoolean(boundObject->targetFunction()->hasInstance(exec, value)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const char* const boundPrefix = "bound ";
-
</del><span class="cx"> JSBoundFunction* JSBoundFunction::create(VM& vm, JSGlobalObject* globalObject, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int length, const String& name)
</span><span class="cx"> {
</span><span class="cx"> ConstructData constructData;
</span><span class="lines">@@ -97,7 +95,7 @@
</span><span class="cx"> NativeExecutable* executable = vm.getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor, ASCIILiteral("Function.prototype.bind result"));
</span><span class="cx"> JSBoundFunction* function = new (NotNull, allocateCell<JSBoundFunction>(vm.heap)) JSBoundFunction(vm, globalObject, globalObject->boundFunctionStructure(), targetFunction, boundThis, boundArgs);
</span><span class="cx">
</span><del>- function->finishCreation(vm, executable, length, makeString(ASCIILiteral(boundPrefix), name));
</del><ins>+ function->finishCreation(vm, executable, length, makeString("bound ", name));
</ins><span class="cx"> return function;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -136,10 +134,7 @@
</span><span class="cx">
</span><span class="cx"> String JSBoundFunction::toStringName(ExecState* exec)
</span><span class="cx"> {
</span><del>- String result = name(exec);
- ASSERT(result.find(ASCIILiteral(boundPrefix)) == 0);
- static const size_t boundPrefixLength = 6;
- return result.substring(boundPrefixLength);
</del><ins>+ return m_targetFunction->get(exec, exec->vm().propertyNames->name).toWTFString(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>