<!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>[202025] 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/202025">202025</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-13 21:33:06 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Show Exception Stack in UncaughtExceptionReporter view
https://bugs.webkit.org/show_bug.cgi?id=158657
<rdar://problem/26754441>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-06-13
Reviewed by Darin Adler.
* UserInterface/Debug/UncaughtExceptionReporter.css:
(.uncaught-exception-sheet li):
Make newlines significant.
* UserInterface/Debug/UncaughtExceptionReporter.js:
(unblockEventHandlers):
(handleError):
(handleLinkClick):
(formattedEntry):
Format the exception and a possible stack with a bit of sanitizing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebugUncaughtExceptionReportercss">trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebugUncaughtExceptionReporterjs">trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (202024 => 202025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-14 04:03:02 UTC (rev 202024)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-14 04:33:06 UTC (rev 202025)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show Exception Stack in UncaughtExceptionReporter view
+ https://bugs.webkit.org/show_bug.cgi?id=158657
+ <rdar://problem/26754441>
+
+ Reviewed by Darin Adler.
+
+ * UserInterface/Debug/UncaughtExceptionReporter.css:
+ (.uncaught-exception-sheet li):
+ Make newlines significant.
+
+ * UserInterface/Debug/UncaughtExceptionReporter.js:
+ (unblockEventHandlers):
+ (handleError):
+ (handleLinkClick):
+ (formattedEntry):
+ Format the exception and a possible stack with a bit of sanitizing.
+
</ins><span class="cx"> 2016-06-13 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Filter Records not applying to new records
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebugUncaughtExceptionReportercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.css (202024 => 202025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.css 2016-06-14 04:03:02 UTC (rev 202024)
+++ trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.css 2016-06-14 04:33:06 UTC (rev 202025)
</span><span class="lines">@@ -110,4 +110,5 @@
</span><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> word-break: break-word;
</span><span class="cx"> -webkit-user-select: text;
</span><ins>+ white-space: pre;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebugUncaughtExceptionReporterjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js (202024 => 202025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js 2016-06-14 04:03:02 UTC (rev 202024)
+++ trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js 2016-06-14 04:33:06 UTC (rev 202025)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> url: parseURL(error.sourceURL).lastPathComponent,
</span><span class="cx"> lineNumber: error.line,
</span><span class="cx"> columnNumber: error.column,
</span><ins>+ stack: error.stack,
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -65,6 +66,7 @@
</span><span class="cx"> url: parseURL(event.filename).lastPathComponent,
</span><span class="cx"> lineNumber: event.lineno,
</span><span class="cx"> columnNumber: event.colno,
</span><ins>+ stack: typeof event.error === "object" ? event.error.stack : null,
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,12 +149,31 @@
</span><span class="cx"> dismissErrorSheet();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function formattedEntry(entry) {
+ let message = `${entry.message} (at ${entry.url}:${entry.lineNumber}:${entry.columnNumber})`;
+ if (!entry.stack)
+ return message;
+
+ const indent = " ";
+ let results = [];
+ let lines = entry.stack.split(/\n/g);
+ for (let line of lines) {
+ let atIndex = line.indexOf("@");
+ let slashIndex = Math.max(line.lastIndexOf("/"), atIndex);
+ let functionName = line.substring(0, atIndex) || "?";
+ let location = line.substring(slashIndex + 1, line.length);
+ results.push(`${indent}${functionName} @ ${location}`);
+ }
+
+ return message + "\n" + results.join("\n");
+ }
+
</ins><span class="cx"> let inspectedPageURL = null;
</span><span class="cx"> try {
</span><span class="cx"> inspectedPageURL = WebInspector.frameResourceManager.mainFrame.url;
</span><span class="cx"> } catch (e) { }
</span><span class="cx">
</span><del>- let formattedErrorDetails = window.__uncaughtExceptions.map((entry) => `${entry.message} (at ${entry.url}:${entry.lineNumber}:${entry.columnNumber})`);
</del><ins>+ let formattedErrorDetails = window.__uncaughtExceptions.map((entry) => formattedEntry(entry));
</ins><span class="cx"> let detailsForBugReport = formattedErrorDetails.map((line) => ` - ${line}`).join("\n");
</span><span class="cx"> let encodedBugDescription = encodeURIComponent(`-------
</span><span class="cx"> Auto-generated details:
</span></span></pre>
</div>
</div>
</body>
</html>