<!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>[187848] releases/WebKitGTK/webkit-2.8</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/187848">187848</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-04 05:40:53 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187016">r187016</a> - new Date(NaN).toJSON() must return null instead of throwing a TypeError
https://bugs.webkit.org/show_bug.cgi?id=141115
Patch by Jordan Harband <ljharb@gmail.com> on 2015-07-19
Reviewed by Yusuke Suzuki.
Source/JavaScriptCore:
* runtime/DatePrototype.cpp:
(JSC::dateProtoFuncToJSON):
LayoutTests:
* js/dom/JSON-stringify-expected.txt:
* js/resources/JSON-stringify.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsjsdomJSONstringifyexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/js/dom/JSON-stringify-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsjsresourcesJSONstringifyjs">releases/WebKitGTK/webkit-2.8/LayoutTests/js/resources/JSON-stringify.js</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreruntimeDatePrototypecpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/DatePrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (187847 => 187848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-08-04 12:29:01 UTC (rev 187847)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-08-04 12:40:53 UTC (rev 187848)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-19 Jordan Harband <ljharb@gmail.com>
+
+ new Date(NaN).toJSON() must return null instead of throwing a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=141115
+
+ Reviewed by Yusuke Suzuki.
+
+ * js/dom/JSON-stringify-expected.txt:
+ * js/resources/JSON-stringify.js:
+
</ins><span class="cx"> 2015-07-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r169105): Do not assign a renderer to multiple selection subtrees.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsjsdomJSONstringifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/js/dom/JSON-stringify-expected.txt (187847 => 187848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/dom/JSON-stringify-expected.txt 2015-08-04 12:29:01 UTC (rev 187847)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/dom/JSON-stringify-expected.txt 2015-08-04 12:40:53 UTC (rev 187848)
</span><span class="lines">@@ -97,6 +97,10 @@
</span><span class="cx"> }
</span><span class="cx"> PASS tests[i](nativeJSON) threw exception An exception.
</span><span class="cx"> function (jsonObject) {
</span><ins>+ return jsonObject.stringify(new Date(NaN));
+ }
+PASS tests[i](nativeJSON) is tests[i].expected
+function (jsonObject) {
</ins><span class="cx"> var d = new Date(0);
</span><span class="cx"> d.toISOString = null;
</span><span class="cx"> return jsonObject.stringify(d);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsjsresourcesJSONstringifyjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/js/resources/JSON-stringify.js (187847 => 187848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/resources/JSON-stringify.js 2015-08-04 12:29:01 UTC (rev 187847)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/resources/JSON-stringify.js 2015-08-04 12:40:53 UTC (rev 187848)
</span><span class="lines">@@ -101,6 +101,10 @@
</span><span class="cx"> });
</span><span class="cx"> result[result.length - 1].throws = true;
</span><span class="cx"> result.push(function(jsonObject){
</span><ins>+ return jsonObject.stringify(new Date(NaN));
+ });
+ result[result.length - 1].expected = 'null';;
+ result.push(function(jsonObject){
</ins><span class="cx"> var d = new Date(0);
</span><span class="cx"> d.toISOString = null;
</span><span class="cx"> return jsonObject.stringify(d);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog (187847 => 187848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-08-04 12:29:01 UTC (rev 187847)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-08-04 12:40:53 UTC (rev 187848)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-19 Jordan Harband <ljharb@gmail.com>
+
+ new Date(NaN).toJSON() must return null instead of throwing a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=141115
+
+ Reviewed by Yusuke Suzuki.
+
+ * runtime/DatePrototype.cpp:
+ (JSC::dateProtoFuncToJSON):
+
</ins><span class="cx"> 2015-07-09 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple.JavaScriptCore: JSC::createRangeError + 20
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreruntimeDatePrototypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/DatePrototype.cpp (187847 => 187848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/DatePrototype.cpp 2015-08-04 12:29:01 UTC (rev 187847)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/DatePrototype.cpp 2015-08-04 12:40:53 UTC (rev 187848)
</span><span class="lines">@@ -1072,7 +1072,13 @@
</span><span class="cx"> JSObject* object = jsCast<JSObject*>(thisValue.toThis(exec, NotStrictMode));
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsNull());
</span><del>-
</del><ins>+
+ JSValue timeValue = object->toPrimitive(exec, PreferNumber);
+ if (exec->hadException())
+ return JSValue::encode(jsNull());
+ if (timeValue.isNumber() && !(timeValue.isInt32() || std::isfinite(timeValue.asDouble())))
+ return JSValue::encode(jsNull());
+
</ins><span class="cx"> JSValue toISOValue = object->get(exec, exec->vm().propertyNames->toISOString);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsNull());
</span></span></pre>
</div>
</div>
</body>
</html>