<!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>[199793] 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/199793">199793</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-20 15:45:04 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: console.table(navigator) throws exception about `rowPreview.propertyPreviews.length`
https://bugs.webkit.org/show_bug.cgi?id=156698
<rdar://problem/25778244>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-20
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._formatParameterAsTable):
Handle a row with a value preview but no sub-property previews (a function).
LayoutTests:
* inspector/console/console-table-expected.txt:
* inspector/console/console-table.html:</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="#trunkLayoutTestsinspectorconsoleconsoletablehtml">trunk/LayoutTests/inspector/console/console-table.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199792 => 199793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-20 22:24:32 UTC (rev 199792)
+++ trunk/LayoutTests/ChangeLog 2016-04-20 22:45:04 UTC (rev 199793)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: console.table(navigator) throws exception about `rowPreview.propertyPreviews.length`
+ https://bugs.webkit.org/show_bug.cgi?id=156698
+ <rdar://problem/25778244>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/console/console-table-expected.txt:
+ * inspector/console/console-table.html:
+
</ins><span class="cx"> 2016-04-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove flaky expectation for imported/mozilla/svg/image/image-filter-01.svg on ios-simulator-wk2
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoletableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-table-expected.txt (199792 => 199793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-table-expected.txt 2016-04-20 22:24:32 UTC (rev 199792)
+++ trunk/LayoutTests/inspector/console/console-table-expected.txt 2016-04-20 22:45:04 UTC (rev 199793)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> CONSOLE MESSAGE: line 3:
</span><span class="cx"> CONSOLE MESSAGE: line 3: apple,orange,banana
</span><span class="cx"> CONSOLE MESSAGE: line 3: [object Object]
</span><ins>+CONSOLE MESSAGE: line 3: [object Object]
</ins><span class="cx"> CONSOLE MESSAGE: line 3: John,Smith,Jane,Doe,Emily,Jones
</span><span class="cx"> CONSOLE MESSAGE: line 3: [object Object],[object Object],[object Object]
</span><span class="cx"> CONSOLE MESSAGE: line 3: [object Object],[object Object],[object Object]
</span><span class="lines">@@ -141,6 +142,59 @@
</span><span class="cx"> "_request": null
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+STEP: console.table({f: function(){}, x: 10})
+{
+ "_listeners": null,
+ "_source": "console-api",
+ "_level": "log",
+ "_messageText": "[object Object]",
+ "_type": "table",
+ "_url": null,
+ "_line": 3,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_parameters": [
+ {
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "Object",
+ "_hasChildren": true,
+ "_preview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "Object",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "f",
+ "_type": "function",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "function",
+ "_description": "function (){}",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": null,
+ "_entries": null
+ }
+ },
+ {
+ "_listeners": null,
+ "_name": "x",
+ "_type": "number",
+ "_value": "10"
+ }
+ ],
+ "_entries": null
+ }
+ }
+ ],
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
</ins><span class="cx"> STEP: console.table([['John', 'Smith'], ['Jane', 'Doe'], ['Emily', 'Jones']])
</span><span class="cx"> {
</span><span class="cx"> "_listeners": null,
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoletablehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-table.html (199792 => 199793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-table.html 2016-04-20 22:24:32 UTC (rev 199792)
+++ trunk/LayoutTests/inspector/console/console-table.html 2016-04-20 22:45:04 UTC (rev 199793)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> "console.table([])", // Empty.
</span><span class="cx"> "console.table(['apple', 'orange', 'banana'])", // Index (array index), Value
</span><span class="cx"> "console.table({firstName: 'John', lastName: 'Smith'})", // Index (property name), Value (property value)
</span><ins>+ "console.table({f: function(){}, x: 10})", // Index (property name), Value (property value)
</ins><span class="cx"> "console.table([['John', 'Smith'], ['Jane', 'Doe'], ['Emily', 'Jones']])", // Index, 0, 1
</span><span class="cx"> "console.table([john, jane, emily])", // Index, firstName, lastName
</span><span class="cx"> "console.table([john, jane, emily], ['firstName'])", // Index, firstName (at least).
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199792 => 199793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-20 22:24:32 UTC (rev 199792)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-20 22:45:04 UTC (rev 199793)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: console.table(navigator) throws exception about `rowPreview.propertyPreviews.length`
+ https://bugs.webkit.org/show_bug.cgi?id=156698
+ <rdar://problem/25778244>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsTable):
+ Handle a row with a value preview but no sub-property previews (a function).
+
</ins><span class="cx"> 2016-04-19 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Use debounce proxies in a couple more places
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (199792 => 199793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-04-20 22:24:32 UTC (rev 199792)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-04-20 22:45:04 UTC (rev 199793)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> for (var i = 0; i < preview.propertyPreviews.length; ++i) {
</span><span class="cx"> var rowProperty = preview.propertyPreviews[i];
</span><span class="cx"> var rowPreview = rowProperty.valuePreview;
</span><del>- if (!rowPreview)
</del><ins>+ if (!rowPreview || !rowPreview.propertyPreviews)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> var rowValue = {};
</span></span></pre>
</div>
</div>
</body>
</html>