<!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>[183320] 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/183320">183320</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-25 18:08:59 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set#keys !== Set#values
https://bugs.webkit.org/show_bug.cgi?id=144190
Patch by Jordan Harband <ljharb@gmail.com> on 2015-04-25
Reviewed by Darin Adler.
Source/JavaScriptCore:
per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-set.prototype.keys
Set#keys should === Set#values
* runtime/SetPrototype.cpp:
(JSC::SetPrototype::finishCreation):
(JSC::setProtoFuncValues):
(JSC::setProtoFuncEntries):
(JSC::setProtoFuncKeys): Deleted.
LayoutTests:
* js/script-tests/set-keys.js: Added.
* js/set-keys-expected.txt: Added.
* js/set-keys.html: Added.</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="#trunkSourceJavaScriptCoreruntimeSetPrototypecpp">trunk/Source/JavaScriptCore/runtime/SetPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsscripttestssetkeysjs">trunk/LayoutTests/js/script-tests/set-keys.js</a></li>
<li><a href="#trunkLayoutTestsjssetkeysexpectedtxt">trunk/LayoutTests/js/set-keys-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjssetkeyshtml">trunk/LayoutTests/js/set-keys.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183319 => 183320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-26 01:06:59 UTC (rev 183319)
+++ trunk/LayoutTests/ChangeLog 2015-04-26 01:08:59 UTC (rev 183320)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-25 Jordan Harband <ljharb@gmail.com>
+
+ Set#keys !== Set#values
+ https://bugs.webkit.org/show_bug.cgi?id=144190
+
+ Reviewed by Darin Adler.
+
+ * js/script-tests/set-keys.js: Added.
+ * js/set-keys-expected.txt: Added.
+ * js/set-keys.html: Added.
+
</ins><span class="cx"> 2015-04-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash if IDBTransaction is aborted right after it's created
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestssetkeysjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/set-keys.js (0 => 183320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/set-keys.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/set-keys.js 2015-04-26 01:08:59 UTC (rev 183320)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+description("Tests basic correctness of ES Set's keys() API");
+
+shouldBe("Set.prototype.keys.length", "0");
+shouldBeTrue("Set.prototype.keys === Set.prototype.values");
</ins></span></pre></div>
<a id="trunkLayoutTestsjssetkeysexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/set-keys-expected.txt (0 => 183320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/set-keys-expected.txt (rev 0)
+++ trunk/LayoutTests/js/set-keys-expected.txt 2015-04-26 01:08:59 UTC (rev 183320)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests basic correctness of ES Set's keys() API
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Set.prototype.keys.length is 0
+PASS Set.prototype.keys === Set.prototype.values is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjssetkeyshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/set-keys.html (0 => 183320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/set-keys.html (rev 0)
+++ trunk/LayoutTests/js/set-keys.html 2015-04-26 01:08:59 UTC (rev 183320)
</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/set-keys.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183319 => 183320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-26 01:06:59 UTC (rev 183319)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-26 01:08:59 UTC (rev 183320)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-25 Jordan Harband <ljharb@gmail.com>
+
+ Set#keys !== Set#values
+ https://bugs.webkit.org/show_bug.cgi?id=144190
+
+ Reviewed by Darin Adler.
+
+ per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-set.prototype.keys
+ Set#keys should === Set#values
+
+ * runtime/SetPrototype.cpp:
+ (JSC::SetPrototype::finishCreation):
+ (JSC::setProtoFuncValues):
+ (JSC::setProtoFuncEntries):
+ (JSC::setProtoFuncKeys): Deleted.
+
</ins><span class="cx"> 2015-04-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow for pausing a JSContext when opening a Web Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSetPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SetPrototype.cpp (183319 => 183320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SetPrototype.cpp 2015-04-26 01:06:59 UTC (rev 183319)
+++ trunk/Source/JavaScriptCore/runtime/SetPrototype.cpp 2015-04-26 01:08:59 UTC (rev 183320)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL setProtoFuncDelete(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL setProtoFuncForEach(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL setProtoFuncHas(ExecState*);
</span><del>-static EncodedJSValue JSC_HOST_CALL setProtoFuncKeys(ExecState*);
</del><span class="cx"> static EncodedJSValue JSC_HOST_CALL setProtoFuncValues(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL setProtoFuncEntries(ExecState*);
</span><span class="cx">
</span><span class="lines">@@ -64,11 +63,11 @@
</span><span class="cx"> JSC_NATIVE_FUNCTION(vm.propertyNames->deleteKeyword, setProtoFuncDelete, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION(vm.propertyNames->forEach, setProtoFuncForEach, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION(vm.propertyNames->has, setProtoFuncHas, DontEnum, 1);
</span><del>- JSC_NATIVE_FUNCTION(vm.propertyNames->keys, setProtoFuncKeys, DontEnum, 0);
</del><span class="cx"> JSC_NATIVE_FUNCTION(vm.propertyNames->entries, setProtoFuncEntries, DontEnum, 0);
</span><span class="cx">
</span><span class="cx"> JSFunction* values = JSFunction::create(vm, globalObject, 0, vm.propertyNames->values.string(), setProtoFuncValues);
</span><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->values, values, DontEnum);
</span><ins>+ putDirectWithoutTransition(vm, vm.propertyNames->keys, values, DontEnum);
</ins><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, values, DontEnum);
</span><span class="cx">
</span><span class="cx"> GetterSetter* accessor = GetterSetter::create(vm, globalObject);
</span><span class="lines">@@ -172,7 +171,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSSet* thisObj = jsDynamicCast<JSSet*>(callFrame->thisValue());
</span><span class="cx"> if (!thisObj)
</span><del>- return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Cannot create a Map value iterator for a non-Map object.")));
</del><ins>+ return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Cannot create a Set value iterator for a non-Set object.")));
</ins><span class="cx"> return JSValue::encode(JSSetIterator::create(callFrame->vm(), callFrame->callee()->globalObject()->setIteratorStructure(), thisObj, SetIterateValue));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,16 +179,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSSet* thisObj = jsDynamicCast<JSSet*>(callFrame->thisValue());
</span><span class="cx"> if (!thisObj)
</span><del>- return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Cannot create a Map key iterator for a non-Map object.")));
</del><ins>+ return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Cannot create a Set key iterator for a non-Set object.")));
</ins><span class="cx"> return JSValue::encode(JSSetIterator::create(callFrame->vm(), callFrame->callee()->globalObject()->setIteratorStructure(), thisObj, SetIterateKeyValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL setProtoFuncKeys(CallFrame* callFrame)
-{
- JSSet* thisObj = jsDynamicCast<JSSet*>(callFrame->thisValue());
- if (!thisObj)
- return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Cannot create a Map entry iterator for a non-Map object.")));
- return JSValue::encode(JSSetIterator::create(callFrame->vm(), callFrame->callee()->globalObject()->setIteratorStructure(), thisObj, SetIterateKey));
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre>
</div>
</div>
</body>
</html>