<!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>[201048] 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/201048">201048</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 15:04:48 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: inspector tests should redirect and log console.trace() calls in test output
https://bugs.webkit.org/show_bug.cgi?id=157802
<rdar://problem/26325671>
Reviewed by Timothy Hatcher.
* UserInterface/Test/FrontendTestHarness.js:
(FrontendTestHarness.prototype.redirectConsoleToTestOutput.createProxyConsoleHandler):
Remove bind() that is now unnecessary. Also redirect console.warn.
(FrontendTestHarness.prototype.redirectConsoleToTestOutput):
For console.trace(), throw and catch a dummy Error to get a stack trace.
Do some post processing on it to remove useless frames and sanitize file paths.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTestFrontendTestHarnessjs">trunk/Source/WebInspectorUI/UserInterface/Test/FrontendTestHarness.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201047 => 201048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-05-17 21:38:17 UTC (rev 201047)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-05-17 22:04:48 UTC (rev 201048)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-05-17 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: inspector tests should redirect and log console.trace() calls in test output
+ https://bugs.webkit.org/show_bug.cgi?id=157802
+ <rdar://problem/26325671>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Test/FrontendTestHarness.js:
+ (FrontendTestHarness.prototype.redirectConsoleToTestOutput.createProxyConsoleHandler):
+ Remove bind() that is now unnecessary. Also redirect console.warn.
+
+ (FrontendTestHarness.prototype.redirectConsoleToTestOutput):
+ For console.trace(), throw and catch a dummy Error to get a stack trace.
+ Do some post processing on it to remove useless frames and sanitize file paths.
+
+2016-05-17 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Web Inspector: Filtering huge data grids should yield occasionally so the UI remains responsive
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157702
</span><span class="cx"> <rdar://problem/26282898>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTestFrontendTestHarnessjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Test/FrontendTestHarness.js (201047 => 201048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Test/FrontendTestHarness.js        2016-05-17 21:38:17 UTC (rev 201047)
+++ trunk/Source/WebInspectorUI/UserInterface/Test/FrontendTestHarness.js        2016-05-17 22:04:48 UTC (rev 201048)
</span><span class="lines">@@ -134,17 +134,51 @@
</span><span class="cx"> let self = this;
</span><span class="cx"> function createProxyConsoleHandler(type) {
</span><span class="cx"> return function() {
</span><del>- self.addResult(`${type}: ` + Array.from(arguments).join(" "));
</del><ins>+ self.addResult(`${type}: ` + Array.from(arguments).join(" "));
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function createProxyConsoleTraceHandler(){
+ return function() {
+ try {
+ throw new Exception();
+ } catch (e) {
+ // Skip the first frame which is added by this function.
+ let frames = e.stack.split("\n").slice(1);
+ let sanitizedFrames = frames.map((frame, i) => {
+ // Most frames are of the form "functionName@file:///foo/bar/File.js:345".
+ // But, some frames do not have a functionName. Get rid of the file path.
+ let nameAndURLSeparator = frame.indexOf("@");
+ let frameName = (nameAndURLSeparator > 0) ? frame.substr(0, nameAndURLSeparator) : "(anonymous)";
+
+ let lastPathSeparator = Math.max(frame.lastIndexOf("/"), frame.lastIndexOf("\\"));
+ let frameLocation = (lastPathSeparator > 0) ? frame.substr(lastPathSeparator + 1) : frame;
+ if (!frameLocation.length)
+ frameLocation = "unknown";
+
+ // Clean up the location so it is bracketed or in parenthesis.
+ if (frame.indexOf("[native code]") !== -1)
+ frameLocation = "[native code]";
+ else
+ frameLocation = "(" + frameLocation + ")"
+
+ return `#${i}: ${frameName} ${frameLocation}`;
+ });
+ self.addResult("TRACE: " + Array.from(arguments).join(" "));
+ self.addResult(sanitizedFrames.join("\n"));
+ }
+ }
+ }
+
</ins><span class="cx"> let redirectedMethods = {};
</span><del>- for (let key in window.console)
- redirectedMethods[key] = window.console[key].bind(window.console);
</del><ins>+ for (let key in window.console)
+ redirectedMethods[key] = window.console[key];
</ins><span class="cx">
</span><del>- for (let type of ["log", "error", "info"])
</del><ins>+ for (let type of ["log", "error", "info", "warn"])
</ins><span class="cx"> redirectedMethods[type] = createProxyConsoleHandler(type.toUpperCase());
</span><span class="cx">
</span><ins>+ redirectedMethods["trace"] = createProxyConsoleTraceHandler();
+
</ins><span class="cx"> this._originalConsole = window.console;
</span><span class="cx"> window.console = redirectedMethods;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>