<!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>[200499] 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/200499">200499</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-05 18:15:24 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/200422">r200422</a>): Web Inspector: Make new Array Iterator objects play nice with Web Inspector
https://bugs.webkit.org/show_bug.cgi?id=157361
<rdar://problem/26099793>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-05
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* builtins/ArrayPrototype.js:
(createArrayIterator):
(values):
(keys):
(entries):
* builtins/TypedArrayPrototype.js:
(values):
(keys):
(entries):
* runtime/CommonIdentifiers.h:
Set the kind on the iterator object, that can be shown
to the inspector if the object is shown in the console.
* inspector/InjectedScriptSource.js:
(InjectedScript.prototype._describe):
Get a better name for the new Array Iterator which is just an Object.
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::subtype):
(Inspector::JSInjectedScriptHost::getInternalProperties):
Detect and handle ArrayIterator object instances. Porting the code
from the JSArrayIterator code path.
LayoutTests:
* platform/mac/inspector/model/remote-object-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayPrototypejs">trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsTypedArrayPrototypejs">trunk/Source/JavaScriptCore/builtins/TypedArrayPrototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayIteratorPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/LayoutTests/ChangeLog 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r200422): Web Inspector: Make new Array Iterator objects play nice with Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=157361
+ <rdar://problem/26099793>
+
+ Reviewed by Timothy Hatcher.
+
+ * platform/mac/inspector/model/remote-object-expected.txt:
+
</ins><span class="cx"> 2016-05-05 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200479.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -3360,16 +3360,44 @@
</span><span class="cx"> EXPRESSION: [][Symbol.iterator]()
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "iterator",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><del>- "_description": "Object",
</del><ins>+ "_description": "Array Iterator",
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><del>- "_description": "Object",
</del><ins>+ "_subtype": "iterator",
+ "_description": "Array Iterator",
</ins><span class="cx"> "_lossless": true,
</span><span class="cx"> "_overflow": false,
</span><del>- "_properties": [],
- "_entries": null
</del><ins>+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "array",
+ "_type": "object",
+ "_subtype": "array",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 0,
+ "_properties": [],
+ "_entries": null
+ },
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "kind",
+ "_type": "string",
+ "_value": "value",
+ "_internal": true
+ }
+ ],
+ "_entries": []
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3377,16 +3405,64 @@
</span><span class="cx"> EXPRESSION: [1][Symbol.iterator]()
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "iterator",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><del>- "_description": "Object",
</del><ins>+ "_description": "Array Iterator",
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><del>- "_description": "Object",
</del><ins>+ "_subtype": "iterator",
+ "_description": "Array Iterator",
</ins><span class="cx"> "_lossless": true,
</span><span class="cx"> "_overflow": false,
</span><del>- "_properties": [],
- "_entries": null
</del><ins>+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "array",
+ "_type": "object",
+ "_subtype": "array",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 1,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "1"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "kind",
+ "_type": "string",
+ "_value": "value",
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "1",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3394,16 +3470,95 @@
</span><span class="cx"> EXPRESSION: [1, 'two', 3, 'four', 5, 'size'][Symbol.iterator]()
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "iterator",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><del>- "_description": "Object",
</del><ins>+ "_description": "Array Iterator",
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><del>- "_description": "Object",
- "_lossless": true,
- "_overflow": false,
- "_properties": [],
- "_entries": null
</del><ins>+ "_subtype": "iterator",
+ "_description": "Array Iterator",
+ "_lossless": false,
+ "_overflow": true,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "array",
+ "_type": "object",
+ "_subtype": "array",
+ "_value": "Array",
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "kind",
+ "_type": "string",
+ "_value": "value",
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "1",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "string",
+ "_description": "two",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "3",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "string",
+ "_description": "four",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "5",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3411,16 +3566,95 @@
</span><span class="cx"> EXPRESSION: [1, 'two', 3, 'four', 5, 'size'].keys()
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "iterator",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><del>- "_description": "Object",
</del><ins>+ "_description": "Array Iterator",
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><del>- "_description": "Object",
- "_lossless": true,
- "_overflow": false,
- "_properties": [],
- "_entries": null
</del><ins>+ "_subtype": "iterator",
+ "_description": "Array Iterator",
+ "_lossless": false,
+ "_overflow": true,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "array",
+ "_type": "object",
+ "_subtype": "array",
+ "_value": "Array",
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "kind",
+ "_type": "string",
+ "_value": "key",
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "0",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "1",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "2",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "3",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "4",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3428,16 +3662,170 @@
</span><span class="cx"> EXPRESSION: [1, 'two', 3, 'four', 5, 'size'].entries()
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "iterator",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><del>- "_description": "Object",
</del><ins>+ "_description": "Array Iterator",
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><del>- "_description": "Object",
- "_lossless": true,
- "_overflow": false,
- "_properties": [],
- "_entries": null
</del><ins>+ "_subtype": "iterator",
+ "_description": "Array Iterator",
+ "_lossless": false,
+ "_overflow": true,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "array",
+ "_type": "object",
+ "_subtype": "array",
+ "_value": "Array",
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "kind",
+ "_type": "string",
+ "_value": "key+value",
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 2,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "0"
+ },
+ {
+ "_listeners": null,
+ "_name": "1",
+ "_type": "number",
+ "_value": "1"
+ }
+ ],
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 2,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "1"
+ },
+ {
+ "_listeners": null,
+ "_name": "1",
+ "_type": "string",
+ "_value": "two"
+ }
+ ],
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 2,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "2"
+ },
+ {
+ "_listeners": null,
+ "_name": "1",
+ "_type": "number",
+ "_value": "3"
+ }
+ ],
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 2,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "3"
+ },
+ {
+ "_listeners": null,
+ "_name": "1",
+ "_type": "string",
+ "_value": "four"
+ }
+ ],
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Array",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 2,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "4"
+ },
+ {
+ "_listeners": null,
+ "_name": "1",
+ "_type": "number",
+ "_value": "5"
+ }
+ ],
+ "_entries": null
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3841,16 +4229,82 @@
</span><span class="cx"> EXPRESSION: x = undefined; (function() { x = arguments; })(1, 'two'); x[Symbol.iterator]()
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "iterator",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><del>- "_description": "Object",
</del><ins>+ "_description": "Array Iterator",
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><del>- "_description": "Object",
</del><ins>+ "_subtype": "iterator",
+ "_description": "Array Iterator",
</ins><span class="cx"> "_lossless": true,
</span><span class="cx"> "_overflow": false,
</span><del>- "_properties": [],
- "_entries": null
</del><ins>+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "array",
+ "_type": "object",
+ "_subtype": "array",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_subtype": "array",
+ "_description": "Arguments",
+ "_lossless": true,
+ "_overflow": false,
+ "_size": 2,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "0",
+ "_type": "number",
+ "_value": "1"
+ },
+ {
+ "_listeners": null,
+ "_name": "1",
+ "_type": "string",
+ "_value": "two"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "kind",
+ "_type": "string",
+ "_value": "value",
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "number",
+ "_description": "1",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_value": {
+ "_listeners": null,
+ "_type": "string",
+ "_description": "two",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-05-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r200422): Web Inspector: Make new Array Iterator objects play nice with Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=157361
+ <rdar://problem/26099793>
+
+ Reviewed by Timothy Hatcher.
+
+ * builtins/ArrayPrototype.js:
+ (createArrayIterator):
+ (values):
+ (keys):
+ (entries):
+ * builtins/TypedArrayPrototype.js:
+ (values):
+ (keys):
+ (entries):
+ * runtime/CommonIdentifiers.h:
+ Set the kind on the iterator object, that can be shown
+ to the inspector if the object is shown in the console.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.prototype._describe):
+ Get a better name for the new Array Iterator which is just an Object.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::subtype):
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ Detect and handle ArrayIterator object instances. Porting the code
+ from the JSArrayIterator code path.
+
</ins><span class="cx"> 2016-05-05 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] In DFG, an OSR Exit on SetLocal can trash its child node
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -25,9 +25,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> @constructor
</span><del>-function createArrayIterator(iteratedObject, iterationFunction)
</del><ins>+function createArrayIterator(iteratedObject, kind, iterationFunction)
</ins><span class="cx"> {
</span><span class="cx"> this.@iteratedObject = iteratedObject;
</span><ins>+ this.@arrayIteratorKind = kind;
</ins><span class="cx"> this.@arrayIteratorNextIndex = 0;
</span><span class="cx"> this.@arrayIteratorNext = iterationFunction;
</span><span class="cx"> this.@arrayIteratorIsDone = false;
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> throw new @TypeError("Array.prototype.values requires that |this| not be null");
</span><span class="cx"> throw new @TypeError("Array.prototype.values requires that |this| not be undefined");
</span><span class="cx"> }
</span><del>- return new @createArrayIterator(@Object(this), @arrayIteratorValueNext);
</del><ins>+ return new @createArrayIterator(@Object(this), "value", @arrayIteratorValueNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function keys()
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> throw new @TypeError("Array.prototype.keys requires that |this| not be undefined");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return new @createArrayIterator(@Object(this), @arrayIteratorKeyNext);
</del><ins>+ return new @createArrayIterator(@Object(this), "key", @arrayIteratorKeyNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function entries()
</span><span class="lines">@@ -65,7 +66,7 @@
</span><span class="cx"> throw new @TypeError("Array.prototype.entries requires that |this| not be undefined");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return new @createArrayIterator(@Object(this), @arrayIteratorKeyValueNext);
</del><ins>+ return new @createArrayIterator(@Object(this), "key+value", @arrayIteratorKeyValueNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function reduce(callback /*, initialValue */)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsTypedArrayPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/TypedArrayPrototype.js (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/TypedArrayPrototype.js 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/builtins/TypedArrayPrototype.js 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -30,21 +30,21 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx"> @typedArrayLength(this);
</span><del>- return new @createArrayIterator(this, @arrayIteratorValueNext);
</del><ins>+ return new @createArrayIterator(this, "value", @arrayIteratorValueNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function keys()
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx"> @typedArrayLength(this);
</span><del>- return new @createArrayIterator(this, @arrayIteratorKeyNext);
</del><ins>+ return new @createArrayIterator(this, "key", @arrayIteratorKeyNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function entries()
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx"> @typedArrayLength(this);
</span><del>- return new @createArrayIterator(this, @arrayIteratorKeyValueNext);
</del><ins>+ return new @createArrayIterator(this, "key+value", @arrayIteratorKeyValueNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function every(callback /*, thisArg */)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -863,6 +863,9 @@
</span><span class="cx"> if (subtype === "array")
</span><span class="cx"> return className;
</span><span class="cx">
</span><ins>+ if (subtype === "iterator" && Symbol.toStringTag in obj)
+ return obj[Symbol.toStringTag];
+
</ins><span class="cx"> // NodeList in JSC is a function, check for array prior to this.
</span><span class="cx"> if (typeof obj === "function")
</span><span class="cx"> return toString(obj);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -161,6 +161,9 @@
</span><span class="cx"> || value.inherits(JSPropertyNameIterator::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("iterator"));
</span><span class="cx">
</span><ins>+ if (object && object->getDirect(exec->vm(), exec->vm().propertyNames->builtinNames().arrayIteratorNextIndexPrivateName()))
+ return jsNontrivialString(exec, ASCIILiteral("iterator"));
+
</ins><span class="cx"> if (value.inherits(JSInt8Array::info()) || value.inherits(JSInt16Array::info()) || value.inherits(JSInt32Array::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("array"));
</span><span class="cx"> if (value.inherits(JSUint8Array::info()) || value.inherits(JSUint16Array::info()) || value.inherits(JSUint32Array::info()))
</span><span class="lines">@@ -270,6 +273,19 @@
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (JSObject* iteratorObject = jsDynamicCast<JSObject*>(value)) {
+ if (iteratorObject->getDirect(exec->vm(), exec->vm().propertyNames->builtinNames().arrayIteratorNextIndexPrivateName())) {
+ JSValue iteratedValue = iteratorObject->getDirect(exec->vm(), exec->vm().propertyNames->builtinNames().iteratedObjectPrivateName());
+ JSValue kind = iteratorObject->getDirect(exec->vm(), exec->vm().propertyNames->builtinNames().arrayIteratorKindPrivateName());
+
+ unsigned index = 0;
+ JSArray* array = constructEmptyArray(exec, nullptr, 2);
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "array", iteratedValue));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", kind));
+ return array;
+ }
+ }
+
</ins><span class="cx"> if (JSArrayIterator* arrayIterator = jsDynamicCast<JSArrayIterator*>(value)) {
</span><span class="cx"> String kind;
</span><span class="cx"> switch (arrayIterator->kind(exec)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayIteratorPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -26,12 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ArrayIteratorPrototype.h"
</span><span class="cx">
</span><del>-namespace JSC {
-
-}
-
</del><span class="cx"> #include "ArrayIteratorPrototype.lut.h"
</span><del>-
</del><span class="cx"> #include "IteratorOperations.h"
</span><span class="cx"> #include "JSArrayIterator.h"
</span><span class="cx"> #include "JSCInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (200498 => 200499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-05-06 00:05:04 UTC (rev 200498)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-05-06 01:15:24 UTC (rev 200499)
</span><span class="lines">@@ -331,6 +331,7 @@
</span><span class="cx"> macro(arrayIterationKind) \
</span><span class="cx"> macro(arrayIteratorNext) \
</span><span class="cx"> macro(arrayIteratorIsDone) \
</span><ins>+ macro(arrayIteratorKind) \
</ins><span class="cx"> macro(charCodeAt) \
</span><span class="cx"> macro(iteratedString) \
</span><span class="cx"> macro(stringIteratorNextIndex) \
</span></span></pre>
</div>
</div>
</body>
</html>