<!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>[199529] 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/199529">199529</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-13 21:59:49 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSContext Inspector: Improve Class instances and JSC API Exported Values view in Console / ObjectTree
https://bugs.webkit.org/show_bug.cgi?id=156566
<rdar://problem/16392365>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-13
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/InjectedScriptSource.js:
(InjectedScript.RemoteObject.prototype._appendPropertyPreviews):
Treat non-basic object types as not lossless so they can be expanded.
Show non-enumerable native getters in Object previews.
LayoutTests:
* inspector/console/console-table-expected.txt:
* inspector/model/remote-object.html:
* platform/mac/inspector/model/remote-object-expected.txt:
More values are treated as not-lossless and therefore expandable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoletableexpectedtxt">trunk/LayoutTests/inspector/console/console-table-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjecthtml">trunk/LayoutTests/inspector/model/remote-object.html</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="#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 (199528 => 199529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-14 03:21:29 UTC (rev 199528)
+++ trunk/LayoutTests/ChangeLog 2016-04-14 04:59:49 UTC (rev 199529)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ JSContext Inspector: Improve Class instances and JSC API Exported Values view in Console / ObjectTree
+ https://bugs.webkit.org/show_bug.cgi?id=156566
+ <rdar://problem/16392365>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/console/console-table-expected.txt:
+ * inspector/model/remote-object.html:
+ * platform/mac/inspector/model/remote-object-expected.txt:
+ More values are treated as not-lossless and therefore expandable.
+
</ins><span class="cx"> 2016-04-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Nested browsing context created for <object> or <embed> should respect object-src directive
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoletableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-table-expected.txt (199528 => 199529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-table-expected.txt 2016-04-14 03:21:29 UTC (rev 199528)
+++ trunk/LayoutTests/inspector/console/console-table-expected.txt 2016-04-14 04:59:49 UTC (rev 199529)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "array",
</span><span class="cx"> "_description": "Array",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_size": 3,
</span><span class="cx"> "_properties": [
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Person",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Person",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Person",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "array",
</span><span class="cx"> "_description": "Array",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_size": 3,
</span><span class="cx"> "_properties": [
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Person",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Person",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Person",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (199528 => 199529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html 2016-04-14 03:21:29 UTC (rev 199528)
+++ trunk/LayoutTests/inspector/model/remote-object.html 2016-04-14 04:59:49 UTC (rev 199529)
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx">
</span><span class="cx"> {expression: "Person = class Person { constructor(name){} get fullName(){} methodName(p1, p2){} }; Person"}, // Constructor => class type
</span><span class="cx"> {expression: "Person.prototype.methodName"}, // Method => just a function type
</span><ins>+ {expression: "new Person"}, // Instance, not lossless, it's prototype may have interesting methods to show
</ins><span class="cx"> {expression: "Alpha = class A { methodA(){} }; Beta = class B extends Alpha { methodB(){} }; Beta"},
</span><span class="cx"> {expression: "[Beta]"},
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt (199528 => 199529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-04-14 03:21:29 UTC (rev 199528)
+++ trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-04-14 04:59:49 UTC (rev 199529)
</span><span class="lines">@@ -1120,7 +1120,7 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "array",
</span><span class="cx"> "_description": "Int32Array",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_size": 4,
</span><span class="cx"> "_properties": [
</span><span class="lines">@@ -1166,7 +1166,7 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "array",
</span><span class="cx"> "_description": "Int32Array",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_size": 4,
</span><span class="cx"> "_properties": [
</span><span class="lines">@@ -1481,7 +1481,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Foo",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [],
</span><span class="cx"> "_entries": null
</span><span class="lines">@@ -1498,7 +1498,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Foo2",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [],
</span><span class="cx"> "_entries": null
</span><span class="lines">@@ -1515,7 +1515,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Foo3",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [],
</span><span class="cx"> "_entries": null
</span><span class="lines">@@ -1567,7 +1567,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Bar2",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1640,7 +1640,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "ArrayBuffer",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1664,7 +1664,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "DataView",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1678,6 +1678,12 @@
</span><span class="cx"> "_name": "byteLength",
</span><span class="cx"> "_type": "number",
</span><span class="cx"> "_value": "16"
</span><ins>+ },
+ {
+ "_listeners": null,
+ "_name": "buffer",
+ "_type": "object",
+ "_value": "ArrayBuffer"
</ins><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "_entries": null
</span><span class="lines">@@ -2297,7 +2303,7 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "error",
</span><span class="cx"> "_description": "TypeError: undefined is not an object (evaluating '[].x.x')",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -2341,7 +2347,7 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "error",
</span><span class="cx"> "_description": "SyntaxError: Unexpected token ')'",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -4492,7 +4498,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Promise",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -4517,7 +4523,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Promise",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -4549,7 +4555,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Promise",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -4581,7 +4587,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Promise",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -4613,7 +4619,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_description": "Promise",
</span><del>- "_lossless": true,
</del><ins>+ "_lossless": false,
</ins><span class="cx"> "_overflow": false,
</span><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -4754,6 +4760,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: new Person
+{
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "Person",
+ "_preview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "Person",
+ "_lossless": false,
+ "_overflow": false,
+ "_properties": [],
+ "_entries": null
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: Alpha = class A { methodA(){} }; Beta = class B extends Alpha { methodB(){} }; Beta
</span><span class="cx"> {
</span><span class="cx"> "_type": "function",
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199528 => 199529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-14 03:21:29 UTC (rev 199528)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-14 04:59:49 UTC (rev 199529)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ JSContext Inspector: Improve Class instances and JSC API Exported Values view in Console / ObjectTree
+ https://bugs.webkit.org/show_bug.cgi?id=156566
+ <rdar://problem/16392365>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.RemoteObject.prototype._appendPropertyPreviews):
+ Treat non-basic object types as not lossless so they can be expanded.
+ Show non-enumerable native getters in Object previews.
+
</ins><span class="cx"> 2016-04-13 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Some tests fail with ES6 `u` (Unicode) flag for regular expressions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (199528 => 199529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-04-14 03:21:29 UTC (rev 199528)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-04-14 04:59:49 UTC (rev 199529)
</span><span class="lines">@@ -1128,15 +1128,24 @@
</span><span class="cx">
</span><span class="cx"> // Do not show "__proto__" in preview.
</span><span class="cx"> var name = descriptor.name;
</span><del>- if (name === "__proto__")
</del><ins>+ if (name === "__proto__") {
+ // Non basic __proto__ objects may have interesting, non-enumerable, methods to show.
+ if (descriptor.value && descriptor.value.constructor
+ && descriptor.value.constructor !== Object
+ && descriptor.value.constructor !== Array
+ && descriptor.value.constructor !== RegExp)
+ preview.lossless = false;
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // For arrays, only allow indexes.
</span><span class="cx"> if (this.subtype === "array" && !isUInt32(name))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // Do not show non-enumerable non-own properties. Special case to allow array indexes that may be on the prototype.
- if (!descriptor.enumerable && !descriptor.isOwn && this.subtype !== "array")
</del><ins>+ // Do not show non-enumerable non-own properties.
+ // Special case to allow array indexes that may be on the prototype.
+ // Special case to allow native getters on non-RegExp objects.
+ if (!descriptor.enumerable && !descriptor.isOwn && !(this.subtype === "array" || (this.subtype !== "regexp" && descriptor.nativeGetter)))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // If we have a filter, only show properties in the filter.
</span></span></pre>
</div>
</div>
</body>
</html>