<!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>[194243] trunk/Source/WebInspectorUI</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/194243">194243</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-17 15:37:51 -0800 (Thu, 17 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Improve console.trace, make it more like console.assert and inline the message
https://bugs.webkit.org/show_bug.cgi?id=152352
Reviewed by Timothy Hatcher.
* Localizations/en.lproj/localizedStrings.js:
New "Trace" related strings.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype.expand):
Since we auto-expand Trace messages for their Call Stack, don't also
auto-expand a single inner object, which may be big and push the
actual stack trace off the screen.
(WebInspector.ConsoleMessageView.prototype._appendMessageTextAndArguments):
Behave like Assert messages and absorb a message string, and include
extra arguments gracefully.
(WebInspector.ConsoleMessageView.prototype._appendFormattedArguments):
For expandable messages with simple extra arguments (console.trace with
primitives and backtrace, or console.assert with primitives and backtrace)
we were hiding the inline lossless previews and not showing them as a
bulleted list below. We can just keep the lossless previews inline in the
title, since they were only put there because they are small and lossless.
(WebInspector.ConsoleMessageView.prototype.toClipboardString):
No need to hard code "console.trace()" in the clipboard.
* UserInterface/Views/ConsoleMessageView.css:
(.console-message.expandable.expanded :matches(.console-message-preview, .console-message-preview-divider):not(.inline-lossless)):
(.console-message.expandable.expanded :matches(.console-message-preview, .console-message-preview-divider)): Deleted.
Don't hide the inline lossless preview in the console message title when it is inline-lossless.
* UserInterface/Views/ObjectTreeView.js:
(WebInspector.ObjectTreeView.prototype.expand):
Do not allow expanding a loss-less preview.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194242 => 194243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-17 23:37:48 UTC (rev 194242)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-17 23:37:51 UTC (rev 194243)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-12-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve console.trace, make it more like console.assert and inline the message
+ https://bugs.webkit.org/show_bug.cgi?id=152352
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ New "Trace" related strings.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype.expand):
+ Since we auto-expand Trace messages for their Call Stack, don't also
+ auto-expand a single inner object, which may be big and push the
+ actual stack trace off the screen.
+
+ (WebInspector.ConsoleMessageView.prototype._appendMessageTextAndArguments):
+ Behave like Assert messages and absorb a message string, and include
+ extra arguments gracefully.
+
+ (WebInspector.ConsoleMessageView.prototype._appendFormattedArguments):
+ For expandable messages with simple extra arguments (console.trace with
+ primitives and backtrace, or console.assert with primitives and backtrace)
+ we were hiding the inline lossless previews and not showing them as a
+ bulleted list below. We can just keep the lossless previews inline in the
+ title, since they were only put there because they are small and lossless.
+
+ (WebInspector.ConsoleMessageView.prototype.toClipboardString):
+ No need to hard code "console.trace()" in the clipboard.
+
+ * UserInterface/Views/ConsoleMessageView.css:
+ (.console-message.expandable.expanded :matches(.console-message-preview, .console-message-preview-divider):not(.inline-lossless)):
+ (.console-message.expandable.expanded :matches(.console-message-preview, .console-message-preview-divider)): Deleted.
+ Don't hide the inline lossless preview in the console message title when it is inline-lossless.
+
+ * UserInterface/Views/ObjectTreeView.js:
+ (WebInspector.ObjectTreeView.prototype.expand):
+ Do not allow expanding a loss-less preview.
+
</ins><span class="cx"> 2015-12-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add JSContext Script Profiling
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (194242 => 194243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-17 23:37:48 UTC (rev 194242)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-17 23:37:51 UTC (rev 194243)
</span><span class="lines">@@ -620,6 +620,8 @@
</span><span class="cx"> localizedStrings["Total Time"] = "Total Time";
</span><span class="cx"> localizedStrings["Total number of resources, click to show the Resources tab"] = "Total number of resources, click to show the Resources tab";
</span><span class="cx"> localizedStrings["Total size of all resources, click to show the Network Requests timeline"] = "Total size of all resources, click to show the Network Requests timeline";
</span><ins>+localizedStrings["Trace"] = "Trace";
+localizedStrings["Trace: %s"] = "Trace: %s";
</ins><span class="cx"> localizedStrings["Transfered"] = "Transfered";
</span><span class="cx"> localizedStrings["Transform"] = "Transform";
</span><span class="cx"> localizedStrings["Transition"] = "Transition";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css (194242 => 194243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css 2015-12-17 23:37:48 UTC (rev 194242)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css 2015-12-17 23:37:51 UTC (rev 194243)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> background-image: url(../Images/DisclosureTriangles.svg#open-normal);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-message.expandable.expanded :matches(.console-message-preview, .console-message-preview-divider) {
</del><ins>+.console-message.expandable.expanded :matches(.console-message-preview, .console-message-preview-divider):not(.inline-lossless) {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (194242 => 194243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-17 23:37:48 UTC (rev 194242)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-17 23:37:51 UTC (rev 194243)
</span><span class="lines">@@ -157,7 +157,8 @@
</span><span class="cx"> this._element.classList.add("expanded");
</span><span class="cx">
</span><span class="cx"> // Auto-expand an inner object tree if there is a single object.
</span><del>- if (this._objectTree) {
</del><ins>+ // For Trace messages we are auto-expanding for the call stack, don't also auto-expand an object as well.
+ if (this._objectTree && this._message.type !== WebInspector.ConsoleMessage.MessageType.Trace) {
</ins><span class="cx"> if (!this._extraParameters || this._extraParameters.length <= 1)
</span><span class="cx"> this._objectTree.expand();
</span><span class="cx"> }
</span><span class="lines">@@ -189,9 +190,6 @@
</span><span class="cx"> if (this._message.savedResultIndex)
</span><span class="cx"> clipboardString = clipboardString.replace(/\s*=\s*(\$\d+)$/, " = $1");
</span><span class="cx">
</span><del>- if (this._message.type === WebInspector.ConsoleMessage.MessageType.Trace)
- clipboardString = "console.trace()";
-
</del><span class="cx"> let hasStackTrace = this._shouldShowStackTrace();
</span><span class="cx"> if (!hasStackTrace) {
</span><span class="cx"> let repeatString = this.repeatCount > 1 ? "x" + this.repeatCount : "";
</span><span class="lines">@@ -234,8 +232,14 @@
</span><span class="cx"> if (this._message.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI) {
</span><span class="cx"> switch (this._message.type) {
</span><span class="cx"> case WebInspector.ConsoleMessage.MessageType.Trace:
</span><del>- // FIXME: We should use a better string then console.trace.
- element.append("console.trace()");
</del><ins>+ var args = [WebInspector.UIString("Trace")];
+ if (this._message.parameters) {
+ if (this._message.parameters[0].type === "string")
+ args = [WebInspector.UIString("Trace: %s")].concat(this._message.parameters);
+ else
+ args = args.concat(this._message.parameters);
+ }
+ this._appendFormattedArguments(element, args);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.ConsoleMessage.MessageType.Assert:
</span><span class="lines">@@ -462,8 +466,11 @@
</span><span class="cx"> previewContainer.appendChild(previewElement);
</span><span class="cx">
</span><span class="cx"> // If this preview is effectively lossless, we can avoid making this console message expandable.
</span><del>- if ((isPreviewView && preview.lossless) || (!isPreviewView && this._shouldConsiderObjectLossless(parameter)))
</del><ins>+ if ((isPreviewView && preview.lossless) || (!isPreviewView && this._shouldConsiderObjectLossless(parameter))) {
</ins><span class="cx"> this._extraParameters = null;
</span><ins>+ enclosedElement.classList.add("inline-lossless");
+ previewContainer.classList.add("inline-lossless");
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> // Multiple objects. Show an indicator.
</span><span class="cx"> builderElement.append(" ", enclosedElement);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js (194242 => 194243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-12-17 23:37:48 UTC (rev 194242)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-12-17 23:37:51 UTC (rev 194243)
</span><span class="lines">@@ -182,6 +182,9 @@
</span><span class="cx"> if (this._expanded)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (this._hasLosslessPreview)
+ return;
+
</ins><span class="cx"> this._expanded = true;
</span><span class="cx"> this._element.classList.add("expanded");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>