<!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>[202568] 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/202568">202568</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-28 08:33:49 -0700 (Tue, 28 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: selectElement.options shows unexpected entries in console (named indexes beyond collection length)
https://bugs.webkit.org/show_bug.cgi?id=159192
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-06-28
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/InjectedScriptSource.js:
(InjectedScript.prototype.arrayIndexPropertyNames):
Start with an empty array because we just push valid indexes.
(InjectedScript.prototype._propertyDescriptors):
Avoid the >100 length requirement, and always treat the
array-like objects the same. The frontend currently
doesn't show named indexes for arrays anyways, so they
would have been unused.
LayoutTests:
* inspector/model/remote-object-get-properties-expected.txt:
* inspector/model/remote-object-get-properties.html:
* inspector/runtime/getProperties-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectgetpropertiesexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectgetpropertieshtml">trunk/LayoutTests/inspector/model/remote-object-get-properties.html</a></li>
<li><a href="#trunkLayoutTestsinspectorruntimegetPropertiesexpectedtxt">trunk/LayoutTests/inspector/runtime/getProperties-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202567 => 202568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-28 15:32:39 UTC (rev 202567)
+++ trunk/LayoutTests/ChangeLog 2016-06-28 15:33:49 UTC (rev 202568)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: selectElement.options shows unexpected entries in console (named indexes beyond collection length)
+ https://bugs.webkit.org/show_bug.cgi?id=159192
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/remote-object-get-properties-expected.txt:
+ * inspector/model/remote-object-get-properties.html:
+ * inspector/runtime/getProperties-expected.txt:
+
</ins><span class="cx"> 2016-06-28 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: QuickConsole should update its selection when RuntimeManager.defaultExecutionContextIdentifier changes
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectgetpropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt (202567 => 202568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2016-06-28 15:32:39 UTC (rev 202567)
+++ trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2016-06-28 15:33:49 UTC (rev 202568)
</span><span class="lines">@@ -318,5 +318,43 @@
</span><span class="cx"> constructor
</span><span class="cx"> __proto__
</span><span class="cx"> -----------------------------------------------------
</span><ins>+
+-----------------------------------------------------
+EXPRESSION: document.getElementById('my-select').options
+type: object
+subtype: array
+description: HTMLOptionsCollection
+
+OWN PROPERTIES:
+ 0
+ __proto__
+
+DISPLAYABLE PROPERTIES:
+ 0
+ selectedIndex
+ length
+ __proto__
+
+ALL PROPERTIES:
+ 0
+ constructor
+ selectedIndex
+ length
+ item
+ namedItem
+ add
+ remove
+ toString
+ toLocaleString
+ valueOf
+ hasOwnProperty
+ propertyIsEnumerable
+ isPrototypeOf
+ __defineGetter__
+ __defineSetter__
+ __lookupGetter__
+ __lookupSetter__
+ __proto__
+-----------------------------------------------------
</ins><span class="cx"> DONE
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectgetpropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-get-properties.html (202567 => 202568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-get-properties.html 2016-06-28 15:32:39 UTC (rev 202567)
+++ trunk/LayoutTests/inspector/model/remote-object-get-properties.html 2016-06-28 15:33:49 UTC (rev 202568)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> var boundFunction = unboundFunction.bind(document.body, 1, 2, 3);
</span><span class="cx"> var objectWithSymbolProperties = {prop:1, [Symbol()]:2, [Symbol('sym')]:3, [Symbol('sym')]:4, [Symbol()]: Symbol(), prop2: 5};
</span><span class="cx">
</span><del>-
</del><span class="cx"> // --------
</span><span class="cx"> // test
</span><span class="cx"> // --------
</span><span class="lines">@@ -61,6 +60,7 @@
</span><span class="cx"> {expression: "window.unboundFunction"},
</span><span class="cx"> {expression: "window.boundFunction"},
</span><span class="cx"> {expression: "window.objectWithSymbolProperties"},
</span><ins>+ {expression: "document.getElementById('my-select').options"},
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> function runNextStep() {
</span><span class="lines">@@ -115,5 +115,8 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="window.loadEvent = event; runTest()">
</span><ins>+ <select id="my-select" style="display: none">
+ <option name="1" id="attr_1" value="1"></option>
+ </select>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorruntimegetPropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/runtime/getProperties-expected.txt (202567 => 202568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/runtime/getProperties-expected.txt 2016-06-28 15:32:39 UTC (rev 202567)
+++ trunk/LayoutTests/inspector/runtime/getProperties-expected.txt 2016-06-28 15:33:49 UTC (rev 202568)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> 0 string red
</span><span class="cx"> 1 string green
</span><span class="cx"> 2 string blue
</span><del>- length number 3
</del><span class="cx">
</span><span class="cx"> -- Running test case: CheckPropertiesOfBoundConstructor
</span><span class="cx"> Evaluating expression: Number.bind({}, 5)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202567 => 202568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-28 15:32:39 UTC (rev 202567)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-28 15:33:49 UTC (rev 202568)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: selectElement.options shows unexpected entries in console (named indexes beyond collection length)
+ https://bugs.webkit.org/show_bug.cgi?id=159192
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.prototype.arrayIndexPropertyNames):
+ Start with an empty array because we just push valid indexes.
+
+ (InjectedScript.prototype._propertyDescriptors):
+ Avoid the >100 length requirement, and always treat the
+ array-like objects the same. The frontend currently
+ doesn't show named indexes for arrays anyways, so they
+ would have been unused.
+
</ins><span class="cx"> 2016-06-28 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Skip failing INTL test.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (202567 => 202568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-06-28 15:32:39 UTC (rev 202567)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-06-28 15:33:49 UTC (rev 202568)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx">
</span><span class="cx"> function arrayIndexPropertyNames(o, length)
</span><span class="cx"> {
</span><del>- var array = new Array(length);
</del><ins>+ var array = [];
</ins><span class="cx"> for (var i = 0; i < length; ++i) {
</span><span class="cx"> if (i in o)
</span><span class="cx"> array.push("" + i);
</span><span class="lines">@@ -676,16 +676,16 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: <https://webkit.org/b/143589> Web Inspector: Better handling for large collections in Object Trees
</span><span class="cx"> // For array types with a large length we attempt to skip getOwnPropertyNames and instead just sublist of indexes.
</span><del>- var isArrayTypeWithLargeLength = false;
</del><ins>+ var isArrayLike = false;
</ins><span class="cx"> try {
</span><del>- isArrayTypeWithLargeLength = injectedScript._subtype(object) === "array" && isFinite(object.length) && object.length > 100;
</del><ins>+ isArrayLike = injectedScript._subtype(object) === "array" && isFinite(object.length);
</ins><span class="cx"> } catch(e) {}
</span><span class="cx">
</span><span class="cx"> for (var o = object; this._isDefined(o); o = o.__proto__) {
</span><span class="cx"> var isOwnProperty = o === object;
</span><span class="cx">
</span><del>- if (isArrayTypeWithLargeLength && isOwnProperty)
- processProperties(o, arrayIndexPropertyNames(o, 100), isOwnProperty);
</del><ins>+ if (isArrayLike && isOwnProperty)
+ processProperties(o, arrayIndexPropertyNames(o, Math.min(object.length, 100)), isOwnProperty);
</ins><span class="cx"> else {
</span><span class="cx"> processProperties(o, Object.getOwnPropertyNames(o), isOwnProperty);
</span><span class="cx"> if (Object.getOwnPropertySymbols)
</span></span></pre>
</div>
</div>
</body>
</html>