<!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>[183006] 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/183006">183006</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-20 00:05:41 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement `Object.is`
https://bugs.webkit.org/show_bug.cgi?id=143865
Patch by Jordan Harband <ljharb@gmail.com> on 2015-04-20
Reviewed by Darin Adler.
Source/JavaScriptCore:
Expose sameValue to JS, via Object.is
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.is
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorIs):
* runtime/PropertyDescriptor.cpp:
(JSC::sameValue):
LayoutTests:
* js/Object-getOwnPropertyNames-expected.txt:
* js/Object-is-expected.txt: Added.
* js/Object-is.html: Added.
* js/script-tests/Object-getOwnPropertyNames.js:
* js/script-tests/Object-is.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsObjectgetOwnPropertyNamesexpectedtxt">trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsObjectgetOwnPropertyNamesjs">trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyDescriptorcpp">trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsObjectisexpectedtxt">trunk/LayoutTests/js/Object-is-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsObjectishtml">trunk/LayoutTests/js/Object-is.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsObjectisjs">trunk/LayoutTests/js/script-tests/Object-is.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183005 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-20 06:05:26 UTC (rev 183005)
+++ trunk/LayoutTests/ChangeLog 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-20 Jordan Harband <ljharb@gmail.com>
+
+ Implement `Object.is`
+ https://bugs.webkit.org/show_bug.cgi?id=143865
+
+ Reviewed by Darin Adler.
+
+ * js/Object-getOwnPropertyNames-expected.txt:
+ * js/Object-is-expected.txt: Added.
+ * js/Object-is.html: Added.
+ * js/script-tests/Object-getOwnPropertyNames.js:
+ * js/script-tests/Object-is.js: Added.
+
</ins><span class="cx"> 2015-04-19 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement WeakSet
</span></span></pre></div>
<a id="trunkLayoutTestsjsObjectgetOwnPropertyNamesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt (183005 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt 2015-04-20 06:05:26 UTC (rev 183005)
+++ trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> PASS getSortedOwnPropertyNames(decodeURIComponent) is ['length', 'name']
</span><span class="cx"> PASS getSortedOwnPropertyNames(encodeURI) is ['length', 'name']
</span><span class="cx"> PASS getSortedOwnPropertyNames(encodeURIComponent) is ['length', 'name']
</span><del>-PASS getSortedOwnPropertyNames(Object) is ['create', 'defineProperties', 'defineProperty', 'freeze', 'getOwnPropertyDescriptor', 'getOwnPropertyNames', 'getOwnPropertySymbols', 'getPrototypeOf', 'isExtensible', 'isFrozen', 'isSealed', 'keys', 'length', 'name', 'preventExtensions', 'prototype', 'seal']
</del><ins>+PASS getSortedOwnPropertyNames(Object) is ['create', 'defineProperties', 'defineProperty', 'freeze', 'getOwnPropertyDescriptor', 'getOwnPropertyNames', 'getOwnPropertySymbols', 'getPrototypeOf', 'is', 'isExtensible', 'isFrozen', 'isSealed', 'keys', 'length', 'name', 'preventExtensions', 'prototype', 'seal']
</ins><span class="cx"> PASS getSortedOwnPropertyNames(Object.prototype) is ['__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', '__proto__', 'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'valueOf']
</span><span class="cx"> PASS getSortedOwnPropertyNames(Function) is ['length', 'name', 'prototype']
</span><span class="cx"> PASS getSortedOwnPropertyNames(Function.prototype) is ['apply', 'bind', 'call', 'constructor', 'length', 'name', 'toString']
</span></span></pre></div>
<a id="trunkLayoutTestsjsObjectisexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/Object-is-expected.txt (0 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/Object-is-expected.txt (rev 0)
+++ trunk/LayoutTests/js/Object-is-expected.txt 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+Test to ensure correct behavior of Object.is
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Object.is.length is 2
+PASS Object.is.name is 'is'
+PASS Object.is(NaN, NaN) is true
+PASS Object.is(null, null) is true
+PASS Object.is(null) is false
+PASS Object.is(undefined, undefined) is true
+PASS Object.is(true, true) is true
+PASS Object.is(false, false) is true
+PASS Object.is('abc', 'abc') is true
+PASS Object.is(Infinity, Infinity) is true
+PASS Object.is(0, 0) is true
+PASS Object.is(-0, -0) is true
+PASS Object.is(0, -0) is false
+PASS Object.is(-0, 0) is false
+PASS var obj = {}; Object.is(obj, obj) is true
+PASS var arr = []; Object.is(arr, arr) is true
+PASS var sym = Symbol(); Object.is(sym, sym) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsObjectishtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/Object-is.html (0 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/Object-is.html (rev 0)
+++ trunk/LayoutTests/js/Object-is.html 2015-04-20 07:05:41 UTC (rev 183006)
</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/Object-is.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsObjectgetOwnPropertyNamesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js (183005 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js 2015-04-20 06:05:26 UTC (rev 183005)
+++ trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> "encodeURI": "['length', 'name']",
</span><span class="cx"> "encodeURIComponent": "['length', 'name']",
</span><span class="cx"> // Built-in ECMA objects
</span><del>- "Object": "['create', 'defineProperties', 'defineProperty', 'freeze', 'getOwnPropertyDescriptor', 'getOwnPropertyNames', 'getOwnPropertySymbols', 'getPrototypeOf', 'isExtensible', 'isFrozen', 'isSealed', 'keys', 'length', 'name', 'preventExtensions', 'prototype', 'seal']",
</del><ins>+ "Object": "['create', 'defineProperties', 'defineProperty', 'freeze', 'getOwnPropertyDescriptor', 'getOwnPropertyNames', 'getOwnPropertySymbols', 'getPrototypeOf', 'is', 'isExtensible', 'isFrozen', 'isSealed', 'keys', 'length', 'name', 'preventExtensions', 'prototype', 'seal']",
</ins><span class="cx"> "Object.prototype": "['__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', '__proto__', 'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'valueOf']",
</span><span class="cx"> "Function": "['length', 'name', 'prototype']",
</span><span class="cx"> "Function.prototype": "['apply', 'bind', 'call', 'constructor', 'length', 'name', 'toString']",
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsObjectisjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/Object-is.js (0 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/Object-is.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/Object-is.js 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+description("Test to ensure correct behavior of Object.is");
+
+shouldBe("Object.is.length", "2");
+shouldBe("Object.is.name", "'is'");
+shouldBe("Object.is(NaN, NaN)", "true");
+shouldBe("Object.is(null, null)", "true");
+shouldBe("Object.is(null)", "false");
+shouldBe("Object.is(undefined, undefined)", "true");
+shouldBe("Object.is(true, true)", "true");
+shouldBe("Object.is(false, false)", "true");
+shouldBe("Object.is('abc', 'abc')", "true");
+shouldBe("Object.is(Infinity, Infinity)", "true");
+shouldBe("Object.is(0, 0)", "true");
+shouldBe("Object.is(-0, -0)", "true");
+shouldBe("Object.is(0, -0)", "false");
+shouldBe("Object.is(-0, 0)", "false");
+shouldBe("var obj = {}; Object.is(obj, obj)", "true");
+shouldBe("var arr = []; Object.is(arr, arr)", "true");
+shouldBe("var sym = Symbol(); Object.is(sym, sym)", "true");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183005 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-20 06:05:26 UTC (rev 183005)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-20 Jordan Harband <ljharb@gmail.com>
+
+ Implement `Object.is`
+ https://bugs.webkit.org/show_bug.cgi?id=143865
+
+ Reviewed by Darin Adler.
+
+ Expose sameValue to JS, via Object.is
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.is
+
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorIs):
+ * runtime/PropertyDescriptor.cpp:
+ (JSC::sameValue):
+
</ins><span class="cx"> 2015-04-19 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove all the remaining uses of OwnPtr and PassOwnPtr in JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (183005 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2015-04-20 06:05:26 UTC (rev 183005)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorIsSealed(ExecState*);
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorIsFrozen(ExecState*);
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorIsExtensible(ExecState*);
</span><ins>+EncodedJSValue JSC_HOST_CALL objectConstructorIs(ExecState*);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx"> isSealed objectConstructorIsSealed DontEnum|Function 1
</span><span class="cx"> isFrozen objectConstructorIsFrozen DontEnum|Function 1
</span><span class="cx"> isExtensible objectConstructorIsExtensible DontEnum|Function 1
</span><ins>+ is objectConstructorIs DontEnum|Function 2
</ins><span class="cx"> @end
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -579,4 +581,9 @@
</span><span class="cx"> return JSValue::encode(jsBoolean(asObject(obj)->isExtensible()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue JSC_HOST_CALL objectConstructorIs(ExecState* exec)
+{
+ return JSValue::encode(jsBoolean(sameValue(exec, exec->argument(0), exec->argument(1))));
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp (183005 => 183006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp 2015-04-20 06:05:26 UTC (rev 183005)
+++ trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp 2015-04-20 07:05:41 UTC (rev 183006)
</span><span class="lines">@@ -186,8 +186,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> double x = a.asNumber();
</span><span class="cx"> double y = b.asNumber();
</span><del>- if (std::isnan(x))
- return std::isnan(y);
</del><ins>+ bool xIsNaN = std::isnan(x);
+ bool yIsNaN = std::isnan(y);
+ if (xIsNaN || yIsNaN)
+ return xIsNaN && yIsNaN;
</ins><span class="cx"> return bitwise_cast<uint64_t>(x) == bitwise_cast<uint64_t>(y);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>