<!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>[187959] 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/187959">187959</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-05 07:04:47 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Improve Support for PropertyName Iterator (Reflect.enumerate) in Inspector
https://bugs.webkit.org/show_bug.cgi?id=147679
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-08-05
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
Improve native iterator support for the PropertyName Iterator by
allowing inspection of the internal object within the iterator
and peeking of the next upcoming values of the iterator.
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::subtype):
(Inspector::JSInjectedScriptHost::getInternalProperties):
(Inspector::JSInjectedScriptHost::iteratorEntries):
* runtime/JSPropertyNameIterator.h:
(JSC::JSPropertyNameIterator::iteratedValue):
LayoutTests:
* inspector/model/remote-object-expected.txt:
* inspector/model/remote-object.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjecthtml">trunk/LayoutTests/inspector/model/remote-object.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorh">trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187958 => 187959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-05 10:27:18 UTC (rev 187958)
+++ trunk/LayoutTests/ChangeLog 2015-08-05 14:04:47 UTC (rev 187959)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve Support for PropertyName Iterator (Reflect.enumerate) in Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=147679
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/remote-object-expected.txt:
+ * inspector/model/remote-object.html:
+
</ins><span class="cx"> 2015-08-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Put Yosemite mac editing results in the correct location.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-expected.txt (187958 => 187959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-expected.txt 2015-08-05 10:27:18 UTC (rev 187958)
+++ trunk/LayoutTests/inspector/model/remote-object-expected.txt 2015-08-05 14:04:47 UTC (rev 187959)
</span><span class="lines">@@ -3748,6 +3748,162 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: Reflect.enumerate({a:1, b:2, c:3})
+{
+ "_type": "object",
+ "_subtype": "iterator",
+ "_objectId": "<filtered>",
+ "_description": "PropertyName Iterator",
+ "_preview": {
+ "_type": "object",
+ "_subtype": "iterator",
+ "_description": "PropertyName Iterator",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_name": "object",
+ "_type": "object",
+ "_valuePreview": {
+ "_type": "object",
+ "_description": "Object",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_name": "a",
+ "_type": "number",
+ "_value": "1"
+ },
+ {
+ "_name": "b",
+ "_type": "number",
+ "_value": "2"
+ },
+ {
+ "_name": "c",
+ "_type": "number",
+ "_value": "3"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "a",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "b",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "c",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ }
+ ]
+ }
+}
+
+-----------------------------------------------------
+EXPRESSION: Reflect.enumerate([1, 2, 3, 4, 5, 6, 7])
+{
+ "_type": "object",
+ "_subtype": "iterator",
+ "_objectId": "<filtered>",
+ "_description": "PropertyName Iterator",
+ "_preview": {
+ "_type": "object",
+ "_subtype": "iterator",
+ "_description": "PropertyName Iterator",
+ "_lossless": false,
+ "_overflow": true,
+ "_properties": [
+ {
+ "_name": "object",
+ "_type": "object",
+ "_subtype": "array",
+ "_value": "Array",
+ "_internal": true
+ }
+ ],
+ "_entries": [
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "0",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "1",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "2",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "3",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_value": {
+ "_type": "string",
+ "_description": "4",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ }
+ ]
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: new Promise(function(){})
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (187958 => 187959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html 2015-08-05 10:27:18 UTC (rev 187958)
+++ trunk/LayoutTests/inspector/model/remote-object.html 2015-08-05 14:04:47 UTC (rev 187959)
</span><span class="lines">@@ -155,6 +155,8 @@
</span><span class="cx"> {expression: "set = new Set; for (var i = 0; i <= 100; i++) set.add(i); set.values()"},
</span><span class="cx"> {expression: "map.entries()"},
</span><span class="cx"> {expression: "x = undefined; (function() { x = arguments; })(1, 'two'); x[Symbol.iterator]()"},
</span><ins>+ {expression: "Reflect.enumerate({a:1, b:2, c:3})"},
+ {expression: "Reflect.enumerate([1, 2, 3, 4, 5, 6, 7])"},
</ins><span class="cx">
</span><span class="cx"> // Promise
</span><span class="cx"> {expression: "new Promise(function(){})"},
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187958 => 187959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-05 10:27:18 UTC (rev 187958)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-05 14:04:47 UTC (rev 187959)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve Support for PropertyName Iterator (Reflect.enumerate) in Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=147679
+
+ Reviewed by Timothy Hatcher.
+
+ Improve native iterator support for the PropertyName Iterator by
+ allowing inspection of the internal object within the iterator
+ and peeking of the next upcoming values of the iterator.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::subtype):
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ (Inspector::JSInjectedScriptHost::iteratorEntries):
+ * runtime/JSPropertyNameIterator.h:
+ (JSC::JSPropertyNameIterator::iteratedValue):
+
</ins><span class="cx"> 2015-08-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Update Apple Windows build for VS2015
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (187958 => 187959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-08-05 10:27:18 UTC (rev 187958)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-08-05 14:04:47 UTC (rev 187959)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "JSMap.h"
</span><span class="cx"> #include "JSMapIterator.h"
</span><span class="cx"> #include "JSPromise.h"
</span><ins>+#include "JSPropertyNameIterator.h"
</ins><span class="cx"> #include "JSSet.h"
</span><span class="cx"> #include "JSSetIterator.h"
</span><span class="cx"> #include "JSStringIterator.h"
</span><span class="lines">@@ -165,7 +166,8 @@
</span><span class="cx"> if (value.inherits(JSArrayIterator::info())
</span><span class="cx"> || value.inherits(JSMapIterator::info())
</span><span class="cx"> || value.inherits(JSSetIterator::info())
</span><del>- || value.inherits(JSStringIterator::info()))
</del><ins>+ || value.inherits(JSStringIterator::info())
+ || value.inherits(JSPropertyNameIterator::info()))
</ins><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("iterator"));
</span><span class="cx">
</span><span class="cx"> if (value.inherits(JSInt8Array::info()) || value.inherits(JSInt16Array::info()) || value.inherits(JSInt32Array::info()))
</span><span class="lines">@@ -336,6 +338,13 @@
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (JSPropertyNameIterator* propertyNameIterator = jsDynamicCast<JSPropertyNameIterator*>(value)) {
+ unsigned index = 0;
+ JSArray* array = constructEmptyArray(exec, nullptr, 1);
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "object", propertyNameIterator->iteratedValue()));
+ return array;
+ }
+
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -441,6 +450,8 @@
</span><span class="cx"> iterator = setIterator->clone(exec);
</span><span class="cx"> else if (JSStringIterator* stringIterator = jsDynamicCast<JSStringIterator*>(value))
</span><span class="cx"> iterator = stringIterator->clone(exec);
</span><ins>+ else if (JSPropertyNameIterator* propertyNameIterator = jsDynamicCast<JSPropertyNameIterator*>(value))
+ iterator = propertyNameIterator->clone(exec);
</ins><span class="cx"> else
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h (187958 => 187959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h 2015-08-05 10:27:18 UTC (rev 187958)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h 2015-08-05 14:04:47 UTC (rev 187959)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> JSPropertyNameIterator* clone(ExecState*);
</span><span class="cx"> bool next(ExecState*, JSValue&);
</span><span class="cx">
</span><ins>+ JSValue iteratedValue() const { return m_iteratedObject.get(); }
+
</ins><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>