<!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>[205168] 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/205168">205168</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-29 19:07:12 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/202568">r202568</a>): Web Inspector: Expanding Array Prototype in Console shows no properties
https://bugs.webkit.org/show_bug.cgi?id=161263
<rdar://problem/28035849>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-08-29
Reviewed by Matt Baker.
Source/JavaScriptCore:
* inspector/InjectedScriptSource.js:
(InjectedScript.prototype._propertyDescriptors):
Previously we only took the "numeric index fast path" if an object was
array like with length > 100. When we dropped the length check we
ended up breaking our display of Array prototype, because [].__proto__
is an array instance. Get it back by just doing a check of length > 0.
We may want to address this differently in the future by knowing if
we are getting properties for a prototype or not.
LayoutTests:
* inspector/model/remote-object-get-properties-expected.txt:
* inspector/model/remote-object-get-properties.html:
Include tests for an Array and an Array's proto (which is an Array).</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="#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 (205167 => 205168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-30 01:56:37 UTC (rev 205167)
+++ trunk/LayoutTests/ChangeLog 2016-08-30 02:07:12 UTC (rev 205168)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r202568): Web Inspector: Expanding Array Prototype in Console shows no properties
+ https://bugs.webkit.org/show_bug.cgi?id=161263
+ <rdar://problem/28035849>
+
+ Reviewed by Matt Baker.
+
+ * inspector/model/remote-object-get-properties-expected.txt:
+ * inspector/model/remote-object-get-properties.html:
+ Include tests for an Array and an Array's proto (which is an Array).
+
</ins><span class="cx"> 2016-08-29 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> JSON.stringify returns empty when used with performance.timing.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectgetpropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt (205167 => 205168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2016-08-30 01:56:37 UTC (rev 205167)
+++ trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2016-08-30 02:07:12 UTC (rev 205168)
</span><span class="lines">@@ -32,6 +32,195 @@
</span><span class="cx"> -----------------------------------------------------
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: window.simpleArray
+type: object
+subtype: array
+description: Array
+
+OWN PROPERTIES:
+ 0
+ 1
+ 2
+ __proto__
+
+DISPLAYABLE PROPERTIES:
+ 0
+ 1
+ 2
+ __proto__
+
+ALL PROPERTIES:
+ 0
+ 1
+ 2
+ length
+ toString
+ values
+ toLocaleString
+ concat
+ fill
+ join
+ pop
+ push
+ reverse
+ shift
+ slice
+ sort
+ splice
+ unshift
+ every
+ forEach
+ some
+ indexOf
+ lastIndexOf
+ filter
+ reduce
+ reduceRight
+ map
+ entries
+ keys
+ find
+ findIndex
+ includes
+ copyWithin
+ constructor
+ Symbol(Symbol.iterator)
+ Symbol(Symbol.unscopables)
+ valueOf
+ hasOwnProperty
+ propertyIsEnumerable
+ isPrototypeOf
+ __defineGetter__
+ __defineSetter__
+ __lookupGetter__
+ __lookupSetter__
+ __proto__
+-----------------------------------------------------
+
+-----------------------------------------------------
+EXPRESSION: window.arrayProto
+type: object
+subtype: array
+description: Array
+
+OWN PROPERTIES:
+ length
+ toString
+ values
+ toLocaleString
+ concat
+ fill
+ join
+ pop
+ push
+ reverse
+ shift
+ slice
+ sort
+ splice
+ unshift
+ every
+ forEach
+ some
+ indexOf
+ lastIndexOf
+ filter
+ reduce
+ reduceRight
+ map
+ entries
+ keys
+ find
+ findIndex
+ includes
+ copyWithin
+ constructor
+ Symbol(Symbol.iterator)
+ Symbol(Symbol.unscopables)
+ __proto__
+
+DISPLAYABLE PROPERTIES:
+ length
+ toString
+ values
+ toLocaleString
+ concat
+ fill
+ join
+ pop
+ push
+ reverse
+ shift
+ slice
+ sort
+ splice
+ unshift
+ every
+ forEach
+ some
+ indexOf
+ lastIndexOf
+ filter
+ reduce
+ reduceRight
+ map
+ entries
+ keys
+ find
+ findIndex
+ includes
+ copyWithin
+ constructor
+ Symbol(Symbol.iterator)
+ Symbol(Symbol.unscopables)
+ __proto__
+
+ALL PROPERTIES:
+ length
+ toString
+ values
+ toLocaleString
+ concat
+ fill
+ join
+ pop
+ push
+ reverse
+ shift
+ slice
+ sort
+ splice
+ unshift
+ every
+ forEach
+ some
+ indexOf
+ lastIndexOf
+ filter
+ reduce
+ reduceRight
+ map
+ entries
+ keys
+ find
+ findIndex
+ includes
+ copyWithin
+ constructor
+ Symbol(Symbol.iterator)
+ Symbol(Symbol.unscopables)
+ valueOf
+ hasOwnProperty
+ propertyIsEnumerable
+ isPrototypeOf
+ __defineGetter__
+ __defineSetter__
+ __lookupGetter__
+ __lookupSetter__
+ __proto__
+-----------------------------------------------------
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: window.loadEvent
</span><span class="cx"> type: object
</span><span class="cx"> description: Event
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectgetpropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-get-properties.html (205167 => 205168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-get-properties.html 2016-08-30 01:56:37 UTC (rev 205167)
+++ trunk/LayoutTests/inspector/model/remote-object-get-properties.html 2016-08-30 02:07:12 UTC (rev 205168)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx">
</span><span class="cx"> // window.loadEvent is set inside of <body onload="..."> below.
</span><span class="cx"> var simpleObject = {a:1, b:"string"};
</span><ins>+var simpleArray = [1, "two", /three/];
+var arrayProto = [].__proto__;
</ins><span class="cx"> var complexObject = new SuperFoo;
</span><span class="cx"> var badGetterObject = new ClassWithBadGetter;
</span><span class="cx"> var unboundFunction = function() { console.log(arguments); }
</span><span class="lines">@@ -54,6 +56,8 @@
</span><span class="cx"> var currentStepIndex = 0;
</span><span class="cx"> var steps = [
</span><span class="cx"> {expression: "window.simpleObject"},
</span><ins>+ {expression: "window.simpleArray"},
+ {expression: "window.arrayProto"},
</ins><span class="cx"> {expression: "window.loadEvent"},
</span><span class="cx"> {expression: "window.complexObject"},
</span><span class="cx"> {expression: "window.badGetterObject"},
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205167 => 205168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-30 01:56:37 UTC (rev 205167)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-30 02:07:12 UTC (rev 205168)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r202568): Web Inspector: Expanding Array Prototype in Console shows no properties
+ https://bugs.webkit.org/show_bug.cgi?id=161263
+ <rdar://problem/28035849>
+
+ Reviewed by Matt Baker.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.prototype._propertyDescriptors):
+ Previously we only took the "numeric index fast path" if an object was
+ array like with length > 100. When we dropped the length check we
+ ended up breaking our display of Array prototype, because [].__proto__
+ is an array instance. Get it back by just doing a check of length > 0.
+ We may want to address this differently in the future by knowing if
+ we are getting properties for a prototype or not.
+
</ins><span class="cx"> 2016-08-29 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Clean up FTL Capabilities for CompareEq
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (205167 => 205168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-08-30 01:56:37 UTC (rev 205167)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-08-30 02:07:12 UTC (rev 205168)
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> // For array types with a large length we attempt to skip getOwnPropertyNames and instead just sublist of indexes.
</span><span class="cx"> var isArrayLike = false;
</span><span class="cx"> try {
</span><del>- isArrayLike = injectedScript._subtype(object) === "array" && isFinite(object.length);
</del><ins>+ isArrayLike = injectedScript._subtype(object) === "array" && isFinite(object.length) && object.length > 0;
</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></pre>
</div>
</div>
</body>
</html>