<!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>[187537] 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/187537">187537</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-28 19:15:41 -0700 (Tue, 28 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speed up the Stringifier::toJSON() fast case
https://bugs.webkit.org/show_bug.cgi?id=147383
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-07-28
Reviewed by Andreas Kling.
Source/JavaScriptCore:
* runtime/JSONObject.cpp:
(JSC::Stringifier::toJSON):
(JSC::Stringifier::toJSONImpl):
LayoutTests:
Make the fast case of Stringifier::toJSON() inline and the uncommon
case out-of-line.
* js/dom/JSON-stringify-string-object-with-tojson-expected.txt: Added.
* js/dom/JSON-stringify-string-object-with-tojson.html: Added.
* js/resources/JSON-stringify-string-object-with-tojson.js: Added.
(stringObject.toJSON):
(String.prototype.toJSON):</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="#trunkSourceJavaScriptCoreruntimeJSONObjectcpp">trunk/Source/JavaScriptCore/runtime/JSONObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsdomJSONstringifystringobjectwithtojsonexpectedtxt">trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomJSONstringifystringobjectwithtojsonhtml">trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson.html</a></li>
<li><a href="#trunkLayoutTestsjsresourcesJSONstringifystringobjectwithtojsonjs">trunk/LayoutTests/js/resources/JSON-stringify-string-object-with-tojson.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187536 => 187537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-29 02:08:36 UTC (rev 187536)
+++ trunk/LayoutTests/ChangeLog 2015-07-29 02:15:41 UTC (rev 187537)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-28 Benjamin Poulain <bpoulain@apple.com>
+
+ Speed up the Stringifier::toJSON() fast case
+ https://bugs.webkit.org/show_bug.cgi?id=147383
+
+ Reviewed by Andreas Kling.
+
+ Make the fast case of Stringifier::toJSON() inline and the uncommon
+ case out-of-line.
+
+ * js/dom/JSON-stringify-string-object-with-tojson-expected.txt: Added.
+ * js/dom/JSON-stringify-string-object-with-tojson.html: Added.
+ * js/resources/JSON-stringify-string-object-with-tojson.js: Added.
+ (stringObject.toJSON):
+ (String.prototype.toJSON):
+
</ins><span class="cx"> 2015-07-28 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Animations sometimes fail to start
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomJSONstringifystringobjectwithtojsonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson-expected.txt (0 => 187537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson-expected.txt (rev 0)
+++ trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson-expected.txt 2015-07-29 02:15:41 UTC (rev 187537)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+PASS nativeJSON.stringify(stringObject) is "\"Foo\""
+PASS nativeJSON.stringify(stringObject) is JSON.stringify(stringObject)
+PASS nativeJSON.stringify(stringObject) is "\"Weird Case 1\""
+PASS nativeJSON.stringify(stringObject) is JSON.stringify(stringObject)
+PASS nativeJSON.stringify(stringObject) is "\"Bar\""
+PASS nativeJSON.stringify(stringObject) is JSON.stringify(stringObject)
+PASS nativeJSON.stringify(stringObject) is "\"Weird Case 2\""
+PASS nativeJSON.stringify(stringObject) is JSON.stringify(stringObject)
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdomJSONstringifystringobjectwithtojsonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson.html (0 => 187537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson.html (rev 0)
+++ trunk/LayoutTests/js/dom/JSON-stringify-string-object-with-tojson.html 2015-07-29 02:15:41 UTC (rev 187537)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+var nativeJSON = this.JSON;
+this.JSON = null;
+</script>
+<script src="../resources/json2-es5-compat.js"></script>
+<script src="../resources/JSON-stringify-string-object-with-tojson.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsjsresourcesJSONstringifystringobjectwithtojsonjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/resources/JSON-stringify-string-object-with-tojson.js (0 => 187537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/resources/JSON-stringify-string-object-with-tojson.js (rev 0)
+++ trunk/LayoutTests/js/resources/JSON-stringify-string-object-with-tojson.js 2015-07-29 02:15:41 UTC (rev 187537)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+var stringObject = new String("Foo");
+shouldBeEqualToString('nativeJSON.stringify(stringObject)', '"Foo"');
+shouldBe('nativeJSON.stringify(stringObject)', 'JSON.stringify(stringObject)');
+
+stringObject.toJSON = function() { return "Weird Case 1"; }
+shouldBeEqualToString('nativeJSON.stringify(stringObject)', '"Weird Case 1"');
+shouldBe('nativeJSON.stringify(stringObject)', 'JSON.stringify(stringObject)');
+
+var stringObject = new String("Bar");
+shouldBeEqualToString('nativeJSON.stringify(stringObject)', '"Bar"');
+shouldBe('nativeJSON.stringify(stringObject)', 'JSON.stringify(stringObject)');
+
+String.prototype.toJSON = function() { return "Weird Case 2"; }
+shouldBeEqualToString('nativeJSON.stringify(stringObject)', '"Weird Case 2"');
+shouldBe('nativeJSON.stringify(stringObject)', 'JSON.stringify(stringObject)');
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187536 => 187537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-29 02:08:36 UTC (rev 187536)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-29 02:15:41 UTC (rev 187537)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-28 Benjamin Poulain <bpoulain@apple.com>
+
+ Speed up the Stringifier::toJSON() fast case
+ https://bugs.webkit.org/show_bug.cgi?id=147383
+
+ Reviewed by Andreas Kling.
+
+ * runtime/JSONObject.cpp:
+ (JSC::Stringifier::toJSON):
+ (JSC::Stringifier::toJSONImpl):
+
</ins><span class="cx"> 2015-07-28 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> Implement WebAssembly module parser
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (187536 => 187537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2015-07-29 02:08:36 UTC (rev 187536)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2015-07-29 02:15:41 UTC (rev 187537)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> friend class Holder;
</span><span class="cx">
</span><span class="cx"> JSValue toJSON(JSValue, const PropertyNameForFunctionCall&);
</span><ins>+ JSValue toJSONImpl(JSValue, const PropertyNameForFunctionCall&);
</ins><span class="cx">
</span><span class="cx"> enum StringifyResult { StringifyFailed, StringifySucceeded, StringifyFailedDueToUndefinedValue };
</span><span class="cx"> StringifyResult appendStringifiedValue(StringBuilder&, JSValue, JSObject* holder, const PropertyNameForFunctionCall&);
</span><span class="lines">@@ -253,12 +254,16 @@
</span><span class="cx"> return Local<Unknown>(m_exec->vm(), jsString(m_exec, result.toString()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSValue Stringifier::toJSON(JSValue value, const PropertyNameForFunctionCall& propertyName)
</del><ins>+ALWAYS_INLINE JSValue Stringifier::toJSON(JSValue value, const PropertyNameForFunctionCall& propertyName)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_exec->hadException());
</span><span class="cx"> if (!value.isObject() || !asObject(value)->hasProperty(m_exec, m_exec->vm().propertyNames->toJSON))
</span><span class="cx"> return value;
</span><ins>+ return toJSONImpl(value, propertyName);
+}
</ins><span class="cx">
</span><ins>+JSValue Stringifier::toJSONImpl(JSValue value, const PropertyNameForFunctionCall& propertyName)
+{
</ins><span class="cx"> JSValue toJSONFunction = asObject(value)->get(m_exec, m_exec->vm().propertyNames->toJSON);
</span><span class="cx"> if (m_exec->hadException())
</span><span class="cx"> return jsNull();
</span></span></pre>
</div>
</div>
</body>
</html>