<!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>[193248] branches/safari-601-branch/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/193248">193248</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:01:53 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190571">r190571</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsErrorObjectViewcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193247 => 193248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:48 UTC (rev 193247)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:53 UTC (rev 193248)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190571. rdar://problem/23221163
+
+ 2015-10-05 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Error displayed as an object when passed as a second argument to console.log
+ https://bugs.webkit.org/show_bug.cgi?id=149799
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendExtraParameters):
+ Don't format errors as objects.
+
+ (WebInspector.ConsoleMessageView.prototype._formatParameter):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsValue):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsString):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsNode):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsObject):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsError):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsArray):
+ Replace an unnecessary span element with a document fragment.
+
+ * UserInterface/Views/ErrorObjectView.css:
+ (.error-object):
+ Display an error object on the same line as a list bullet.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r190551. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-04 Nikita Vasilyev <nvasilyev@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (193247 => 193248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 19:01:48 UTC (rev 193247)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 19:01:53 UTC (rev 193248)
</span><span class="lines">@@ -363,9 +363,9 @@
</span><span class="cx">
</span><span class="cx"> for (var parameter of this._extraParameters) {
</span><span class="cx"> var listItemElement = this._extraElementsList.appendChild(document.createElement("li"));
</span><del>- var forceObjectExpansion = parameter.type === "object" && (parameter.subtype !== "null" && parameter.subtype !== "regexp" && parameter.subtype !== "node");
</del><ins>+ var forceObjectFormat = parameter.type === "object" && (parameter.subtype !== "null" && parameter.subtype !== "regexp" && parameter.subtype !== "node" && parameter.subtype !== "error");
</ins><span class="cx"> listItemElement.classList.add("console-message-extra-parameter");
</span><del>- listItemElement.appendChild(this._formatParameter(parameter, forceObjectExpansion));
</del><ins>+ listItemElement.appendChild(this._formatParameter(parameter, forceObjectFormat));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -503,43 +503,43 @@
</span><span class="cx">
</span><span class="cx"> var formatter = formatters[type] || this._formatParameterAsValue;
</span><span class="cx">
</span><del>- var span = document.createElement("span");
- formatter.call(this, parameter, span, forceObjectFormat);
- return span;
</del><ins>+ var fragment = document.createDocumentFragment();
+ formatter.call(this, parameter, fragment);
+ return fragment;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _formatParameterAsValue(value, element)
</del><ins>+ _formatParameterAsValue(value, fragment)
</ins><span class="cx"> {
</span><del>- element.appendChild(WebInspector.FormattedValue.createElementForRemoteObject(value));
</del><ins>+ fragment.appendChild(WebInspector.FormattedValue.createElementForRemoteObject(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _formatParameterAsString(object, element)
</del><ins>+ _formatParameterAsString(object, fragment)
</ins><span class="cx"> {
</span><del>- element.appendChild(WebInspector.FormattedValue.createLinkifiedElementString(object.description));
</del><ins>+ fragment.appendChild(WebInspector.FormattedValue.createLinkifiedElementString(object.description));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _formatParameterAsNode(object, element)
</del><ins>+ _formatParameterAsNode(object, fragment)
</ins><span class="cx"> {
</span><del>- element.appendChild(WebInspector.FormattedValue.createElementForNode(object));
</del><ins>+ fragment.appendChild(WebInspector.FormattedValue.createElementForNode(object));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _formatParameterAsObject(object, element, forceExpansion)
</del><ins>+ _formatParameterAsObject(object, fragment, forceExpansion)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Should have a better ObjectTreeView mode for classes (static methods and methods).
</span><span class="cx"> this._objectTree = new WebInspector.ObjectTreeView(object, null, this._rootPropertyPathForObject(object), forceExpansion);
</span><del>- element.appendChild(this._objectTree.element);
</del><ins>+ fragment.appendChild(this._objectTree.element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _formatParameterAsError(object, element)
</del><ins>+ _formatParameterAsError(object, fragment)
</ins><span class="cx"> {
</span><del>- var errorObjectView = new WebInspector.ErrorObjectView(object);
- element.appendChild(errorObjectView.element);
</del><ins>+ this._objectTree = new WebInspector.ErrorObjectView(object);
+ fragment.appendChild(this._objectTree.element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _formatParameterAsArray(array, element)
</del><ins>+ _formatParameterAsArray(array, fragment)
</ins><span class="cx"> {
</span><span class="cx"> this._objectTree = new WebInspector.ObjectTreeView(array, WebInspector.ObjectTreeView.Mode.Properties, this._rootPropertyPathForObject(array));
</span><del>- element.appendChild(this._objectTree.element);
</del><ins>+ fragment.appendChild(this._objectTree.element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _rootPropertyPathForObject(object)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsErrorObjectViewcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css (193247 => 193248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css 2015-12-03 19:01:48 UTC (rev 193247)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css 2015-12-03 19:01:53 UTC (rev 193248)
</span><span class="lines">@@ -23,6 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+.error-object {
+ display: inline-block;
+}
+
</ins><span class="cx"> .error-object::before {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> vertical-align: baseline;
</span></span></pre>
</div>
</div>
</body>
</html>