<!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>[188017] 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/188017">188017</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 20:58:07 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Logging error objects should have a better UI
https://bugs.webkit.org/show_bug.cgi?id=143853
Source/WebInspectorUI:
Previously, an error object looked like any other object, which wasn't very useful.
Source links couldn't be clicked and stacktraces were unreadable.
Unify console.trace, caught and uncaught exceptions. The following examples use
the same StaceTraceView:
- ({}).x.y
- try { ({}).x.y } catch (e) { console.log(e); }
- console.trace()
Reviewed by Brian Burg.
* UserInterface/Main.html:
* UserInterface/Models/CallFrame.js:
(WebInspector.CallFrame.fromPayload):
(WebInspector.CallFrame):
* UserInterface/Protocol/RemoteObject.js:
(WebInspector.RemoteObject.prototype.getOwnPropertyDescriptorsAsObject):
* UserInterface/Test.html:
* UserInterface/Views/CallFrameView.css:
(.call-frame .separator):
(.call-frame .subtitle .source-link): Deleted.
(.call-frame:focus .subtitle .source-link): Deleted.
(.call-frame .subtitle:empty): Deleted.
(.call-frame .subtitle): Deleted.
* UserInterface/Views/CallFrameView.js:
(WebInspector.CallFrameView):
- Start usind CallFrameView in stacktraces.
- Introduce showFunctionName optional argument. In stacktraces anonymous functions
are shown as "(anonymous function)" but in console message location
links (the ones on the right side of a console message) we omit them.
- Dash was a pseudo-element and it couldn't be copied to the clipboard.
Make it an actual HTML element.
* UserInterface/Views/ConsoleMessageView.css:
(.console-message-location.call-frame):
(.console-message-location.call-frame > .title):
(.console-message-location.call-frame > .subtitle > .source-link):
Since .call-frame rules are now used in stacktraces, move console message
specific rules from CallFrameView.css to ConsoleMessageView.css.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._appendLocationLink):
(WebInspector.ConsoleMessageView.prototype._appendStackTrace):
(WebInspector.ConsoleMessageView.prototype._formatParameter):
(WebInspector.ConsoleMessageView.prototype._formatParameterAsError): Added.
Format errors differently from other objects.
* UserInterface/Views/ErrorObjectView.css: Added.
(.error-object::before):
(.error-object.expanded::before):
(.error-object-link-container):
(.error-object.expanded > .formatted-error > .error-object-link-container):
(.error-object:not(.expanded) .error-object-outline):
(.error-object-outline):
* UserInterface/Views/ErrorObjectView.js: Added.
(WebInspector.ErrorObjectView):
(WebInspector.ErrorObjectView.parseStackTrace):
(WebInspector.ErrorObjectView.makeSourceLinkWithPrefix):
(WebInspector.ErrorObjectView.prototype.get object):
(WebInspector.ErrorObjectView.prototype.get element):
(WebInspector.ErrorObjectView.prototype.get treeOutline):
(WebInspector.ErrorObjectView.prototype.get expanded):
(WebInspector.ErrorObjectView.prototype.update):
(WebInspector.ErrorObjectView.prototype.expand):
(WebInspector.ErrorObjectView.prototype.collapse):
(WebInspector.ErrorObjectView.prototype._handlePreviewOrTitleElementClick):
(WebInspector.ErrorObjectView.prototype._buildStackTrace):
ErrorObjectView is used to log caught exceptions, e.g.:
try { i.dont.exist++ } catch (e) { console.log(e) }
* UserInterface/Views/FormattedValue.js:
(WebInspector.FormattedValue.createElementForError): Added.
Create error preview.
(WebInspector.FormattedValue.createElementForTypesAndValue):
Fix typo.
(WebInspector.FormattedValue.createObjectPreviewOrFormattedValueForRemoteObject):
Format errors differently from other objects.
LayoutTests:
Add tests for stack trace format in case it changes.
Reviewed by Brian Burg.
* inspector/debugger/js-stacktrace-expected.txt: Added.
* inspector/debugger/js-stacktrace.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs">trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCallFrameViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCallFrameViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.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="#trunkSourceWebInspectorUIUserInterfaceViewsFormattedValuejs">trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordebuggerjsstacktraceexpectedtxt">trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerjsstacktracehtml">trunk/LayoutTests/inspector/debugger/js-stacktrace.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsErrorObjectViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsErrorObjectViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsStackTraceViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsStackTraceViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/LayoutTests/ChangeLog 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-05 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Logging error objects should have a better UI
+ https://bugs.webkit.org/show_bug.cgi?id=143853
+
+ Add tests for stack trace format in case it changes.
+
+ Reviewed by Brian Burg.
+
+ * inspector/debugger/js-stacktrace-expected.txt: Added.
+ * inspector/debugger/js-stacktrace.html: Added.
+
</ins><span class="cx"> 2015-08-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add missing test case (r187994).
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerjsstacktraceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (0 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+Test that the inspector can parse the stack trace format used by JSC for Error instances and console.trace.
+
+console.trace():
+[
+ {
+ "lineNumber": 15,
+ "columnNumber": 22,
+ "functionName": "typeError",
+ "nativeCode": false
+ },
+ {
+ "lineNumber": 6,
+ "columnNumber": 21,
+ "functionName": "typeErrorWrap",
+ "nativeCode": false
+ }
+]
+
+Error object:
+[
+ {
+ "functionName": "typeError",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": "14",
+ "columnNumber": "30"
+ },
+ {
+ "functionName": "typeErrorWrap",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": "7",
+ "columnNumber": "21"
+ }
+]
+
+console.trace():
+[
+ {
+ "lineNumber": 15,
+ "columnNumber": 22,
+ "functionName": "typeError",
+ "nativeCode": false
+ },
+ {
+ "lineNumber": null,
+ "columnNumber": null,
+ "functionName": "map",
+ "nativeCode": true
+ },
+ {
+ "lineNumber": 22,
+ "columnNumber": 20,
+ "functionName": "testWithNativeCallInBetween",
+ "nativeCode": false
+ }
+]
+
+Error object:
+[
+ {
+ "functionName": "typeError",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": "14",
+ "columnNumber": "30"
+ },
+ {
+ "functionName": "map",
+ "url": "[native code]",
+ "lineNumber": 0,
+ "columnNumber": 0
+ },
+ {
+ "functionName": "testWithNativeCallInBetween",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": "23",
+ "columnNumber": "20"
+ }
+]
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerjsstacktracehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/js-stacktrace.html (0 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/js-stacktrace.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/js-stacktrace.html 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -0,0 +1,112 @@
</span><ins>+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+function typeErrorWrap()
+{
+ return typeError();
+}
+
+function typeError()
+{
+ var object = {};
+ try {
+ object.propertyDoesnt.exist;
+ } catch (e) {
+ console.trace();
+ return e.stack;
+ }
+}
+
+function testWithNativeCallInBetween()
+{
+ return [42].map(typeError)[0];
+}
+
+
+function test()
+{
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, function(event) {
+ InspectorTest.log("\nconsole.trace():");
+
+ var stackTrace = [];
+ var callFramesBeforeEval = stripCallFramesAfterEval(event.data.message.stackTrace.callFrames);
+ for (var callFrame of callFramesBeforeEval) {
+ var lineNumber = callFrame.sourceCodeLocation ? callFrame.sourceCodeLocation.lineNumber : null;
+ var columnNumber = callFrame.sourceCodeLocation ? callFrame.sourceCodeLocation.columnNumber : null;
+ stackTrace.push({
+ lineNumber: lineNumber,
+ columnNumber: columnNumber,
+ functionName: callFrame.functionName,
+ nativeCode: callFrame.nativeCode
+ });
+ }
+
+ InspectorTest.log(JSON.stringify(stackTrace, null, 4));
+ });
+
+ InspectorTest.evaluateInPage("typeErrorWrap()", function(error, result) {
+ InspectorTest.log("\nError object:");
+
+ if (error)
+ InspectorTest.log(error);
+
+ var stackTrace = stripPayloadAfterEval(WebInspector.StackTrace._parseStackTrace(result.value));
+ stackTrace = stripFilePaths(stackTrace);
+
+ InspectorTest.log(JSON.stringify(stackTrace, null, 4));
+ InspectorTest.completeTest();
+ });
+
+ InspectorTest.evaluateInPage("testWithNativeCallInBetween()", function(error, result) {
+ InspectorTest.log("\nError object:");
+
+ if (error)
+ InspectorTest.log(error);
+
+ var stackTrace = stripPayloadAfterEval(WebInspector.StackTrace._parseStackTrace(result.value));
+ stackTrace = stripFilePaths(stackTrace);
+
+ InspectorTest.log(JSON.stringify(stackTrace, null, 4));
+ InspectorTest.completeTest();
+ });
+
+ function stripFilePaths(stackTrace)
+ {
+ for (var frame of stackTrace) {
+ if (typeof frame.url === "string")
+ frame.url = frame.url.replace(/^.+?LayoutTests/, "");
+ }
+ return stackTrace;
+ }
+
+ function stripCallFramesAfterEval(stackTrace)
+ {
+ var index = 0;
+ for (var frame of stackTrace) {
+ if (frame.nativeCode && frame.functionName === null)
+ break;
+ index++;
+ }
+ return stackTrace.slice(0, index);
+ }
+
+ function stripPayloadAfterEval(payload)
+ {
+ var index = 0;
+ for (var frame of payload) {
+ if (frame.functionName === "eval code")
+ break;
+ index++;
+ }
+ return payload.slice(0, index);
+ }
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>
+Test that the inspector can parse the stack trace format used by JSC for Error instances and console.trace.<br>
+</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -1,3 +1,88 @@
</span><ins>+2015-08-05 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Logging error objects should have a better UI
+ https://bugs.webkit.org/show_bug.cgi?id=143853
+
+ Previously, an error object looked like any other object, which wasn't very useful.
+ Source links couldn't be clicked and stacktraces were unreadable.
+
+ Unify console.trace, caught and uncaught exceptions. The following examples use
+ the same StaceTraceView:
+ - ({}).x.y
+ - try { ({}).x.y } catch (e) { console.log(e); }
+ - console.trace()
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Main.html:
+ * UserInterface/Models/CallFrame.js:
+ (WebInspector.CallFrame.fromPayload):
+ (WebInspector.CallFrame):
+ * UserInterface/Protocol/RemoteObject.js:
+ (WebInspector.RemoteObject.prototype.getOwnPropertyDescriptorsAsObject):
+ * UserInterface/Test.html:
+ * UserInterface/Views/CallFrameView.css:
+ (.call-frame .separator):
+ (.call-frame .subtitle .source-link): Deleted.
+ (.call-frame:focus .subtitle .source-link): Deleted.
+ (.call-frame .subtitle:empty): Deleted.
+ (.call-frame .subtitle): Deleted.
+ * UserInterface/Views/CallFrameView.js:
+ (WebInspector.CallFrameView):
+ - Start usind CallFrameView in stacktraces.
+ - Introduce showFunctionName optional argument. In stacktraces anonymous functions
+ are shown as "(anonymous function)" but in console message location
+ links (the ones on the right side of a console message) we omit them.
+ - Dash was a pseudo-element and it couldn't be copied to the clipboard.
+ Make it an actual HTML element.
+
+ * UserInterface/Views/ConsoleMessageView.css:
+ (.console-message-location.call-frame):
+ (.console-message-location.call-frame > .title):
+ (.console-message-location.call-frame > .subtitle > .source-link):
+ Since .call-frame rules are now used in stacktraces, move console message
+ specific rules from CallFrameView.css to ConsoleMessageView.css.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendLocationLink):
+ (WebInspector.ConsoleMessageView.prototype._appendStackTrace):
+ (WebInspector.ConsoleMessageView.prototype._formatParameter):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsError): Added.
+ Format errors differently from other objects.
+
+ * UserInterface/Views/ErrorObjectView.css: Added.
+ (.error-object::before):
+ (.error-object.expanded::before):
+ (.error-object-link-container):
+ (.error-object.expanded > .formatted-error > .error-object-link-container):
+ (.error-object:not(.expanded) .error-object-outline):
+ (.error-object-outline):
+ * UserInterface/Views/ErrorObjectView.js: Added.
+ (WebInspector.ErrorObjectView):
+ (WebInspector.ErrorObjectView.parseStackTrace):
+ (WebInspector.ErrorObjectView.makeSourceLinkWithPrefix):
+ (WebInspector.ErrorObjectView.prototype.get object):
+ (WebInspector.ErrorObjectView.prototype.get element):
+ (WebInspector.ErrorObjectView.prototype.get treeOutline):
+ (WebInspector.ErrorObjectView.prototype.get expanded):
+ (WebInspector.ErrorObjectView.prototype.update):
+ (WebInspector.ErrorObjectView.prototype.expand):
+ (WebInspector.ErrorObjectView.prototype.collapse):
+ (WebInspector.ErrorObjectView.prototype._handlePreviewOrTitleElementClick):
+ (WebInspector.ErrorObjectView.prototype._buildStackTrace):
+ ErrorObjectView is used to log caught exceptions, e.g.:
+ try { i.dont.exist++ } catch (e) { console.log(e) }
+
+ * UserInterface/Views/FormattedValue.js:
+ (WebInspector.FormattedValue.createElementForError): Added.
+ Create error preview.
+
+ (WebInspector.FormattedValue.createElementForTypesAndValue):
+ Fix typo.
+
+ (WebInspector.FormattedValue.createObjectPreviewOrFormattedValueForRemoteObject):
+ Format errors differently from other objects.
+
</ins><span class="cx"> 2015-08-05 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: REGRESSION (r187634): Script time is missing from the frames timeline
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> <link rel="stylesheet" href="Views/DividerNavigationItem.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/Editing.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/EventListenerSectionGroup.css">
</span><ins>+ <link rel="stylesheet" href="Views/ErrorObjectView.css">
</ins><span class="cx"> <link rel="stylesheet" href="Views/FilterBar.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/FindBanner.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/FlexibleSpaceNavigationItem.css">
</span><span class="lines">@@ -137,6 +138,7 @@
</span><span class="cx"> <link rel="stylesheet" href="Views/SidebarPanel.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/Slider.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/SourceCodeTextEditor.css">
</span><ins>+ <link rel="stylesheet" href="Views/StackTraceView.css">
</ins><span class="cx"> <link rel="stylesheet" href="Views/StorageSidebarPanel.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/StyleRuleIcons.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/SyntaxHighlightingDefaultTheme.css">
</span><span class="lines">@@ -428,6 +430,7 @@
</span><span class="cx"> <script src="Views/DefaultDashboardView.js"></script>
</span><span class="cx"> <script src="Views/DividerNavigationItem.js"></script>
</span><span class="cx"> <script src="Views/EditingSupport.js"></script>
</span><ins>+ <script src="Views/ErrorObjectView.js"></script>
</ins><span class="cx"> <script src="Views/EventListenerSection.js"></script>
</span><span class="cx"> <script src="Views/EventListenerSectionGroup.js"></script>
</span><span class="cx"> <script src="Views/FilterBar.js"></script>
</span><span class="lines">@@ -517,6 +520,7 @@
</span><span class="cx"> <script src="Views/SourceCodeTimelineTimelineDataGridNode.js"></script>
</span><span class="cx"> <script src="Views/SourceCodeTimelineTreeElement.js"></script>
</span><span class="cx"> <script src="Views/SourceMapResourceTreeElement.js"></script>
</span><ins>+ <script src="Views/StackTraceView.js"></script>
</ins><span class="cx"> <script src="Views/StorageSidebarPanel.js"></script>
</span><span class="cx"> <script src="Views/SyntaxHighlightingSupport.js"></script>
</span><span class="cx"> <script src="Views/TextContentView.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -125,7 +125,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var functionName = payload.functionName !== "global code" ? payload.functionName : null;
</del><ins>+ var functionName = null;
+ if (payload.functionName !== "global code" && payload.functionName !== "eval code")
+ functionName = payload.functionName;
</ins><span class="cx">
</span><span class="cx"> return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -42,6 +42,48 @@
</span><span class="cx"> return new WebInspector.StackTrace(callFrames);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static fromString(stack)
+ {
+ var payload = WebInspector.StackTrace._parseStackTrace(stack);
+ return WebInspector.StackTrace.fromPayload(payload);
+ }
+
+ static _parseStackTrace(stack)
+ {
+ var lines = stack.split(/\n/g);
+ var result = [];
+
+ for (var line of lines) {
+ var functionName = "";
+ var url = "";
+ var lineNumber = 0;
+ var columnNumber = 0;
+
+ var index = line.indexOf("@");
+ if (index !== -1) {
+ functionName = line.slice(0, index);
+ url = line.slice(index + 1);
+
+ var columnIndex = url.lastIndexOf(":");
+ if (columnIndex !== -1) {
+ columnNumber = url.slice(columnIndex + 1);
+
+ url = url.slice(0, columnIndex);
+ var lineIndex = url.lastIndexOf(":", columnIndex);
+ if (lineIndex !== -1) {
+ lineNumber = url.slice(lineIndex + 1, columnIndex);
+ url = url.slice(0, lineIndex);
+ }
+ }
+ } else
+ functionName = line;
+
+ result.push({functionName, url, lineNumber, columnNumber});
+ }
+
+ return result;
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get callFrames()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -535,6 +535,19 @@
</span><span class="cx"> RuntimeAgent.getProperties(this._objectId, ownProperties, true, this._getPropertyDescriptorsResolver.bind(this, callback));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ getOwnPropertyDescriptorsAsObject(callback)
+ {
+ this.getOwnPropertyDescriptors(function(properties) {
+ var propertiesResult = {};
+ var internalPropertiesResult = {};
+ for (var propertyDescriptor of properties) {
+ var object = propertyDescriptor.isInternalProperty ? internalPropertiesResult : propertiesResult;
+ object[propertyDescriptor.name] = propertyDescriptor;
+ }
+ callback(propertiesResult, internalPropertiesResult);
+ });
+ }
+
</ins><span class="cx"> _getPropertyDescriptorsResolver(callback, error, properties, internalProperties)
</span><span class="cx"> {
</span><span class="cx"> if (error) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCallFrameViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -40,24 +40,6 @@
</span><span class="cx"> display: inline-block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.call-frame .title {
- max-width: 20vw;
- overflow: hidden;
- text-overflow: ellipsis;
- display: inline-block;
-}
-
-.call-frame .source-link {
- max-width: 50vw;
- overflow: hidden;
- text-overflow: ellipsis;
- display: inline-block;
-}
-
-.call-frame .title + .subtitle > .source-link {
- max-width: 30vw;
-}
-
</del><span class="cx"> .call-frame .subtitle,
</span><span class="cx"> .call-frame .subtitle .source-link {
</span><span class="cx"> color: hsla(0, 0%, 0%, 0.6);
</span><span class="lines">@@ -81,7 +63,7 @@
</span><span class="cx"> background-color: red;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.call-frame .title + .subtitle::before {
- content: " — ";
- color: hsla(0, 0%, 0%, 0.4);
</del><ins>+.call-frame .separator {
+ white-space: nowrap;
+ color: hsla(0, 0%, 0%, 0.2);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCallFrameViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CallFrameView = class CallFrameView extends WebInspector.Object
</span><span class="cx"> {
</span><del>- constructor(callFrame)
</del><ins>+ constructor(callFrame, showFunctionName)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(callFrame instanceof WebInspector.CallFrame);
</span><span class="cx">
</span><span class="lines">@@ -40,32 +40,34 @@
</span><span class="cx"> WebInspector.linkifyElement(callFrameElement, sourceCodeLocation);
</span><span class="cx">
</span><span class="cx"> var linkElement = document.createElement("a");
</span><del>- linkElement.className = "source-link";
</del><ins>+ linkElement.classList.add("source-link");
</ins><span class="cx"> linkElement.href = sourceCodeLocation.sourceCode.url;
</span><del>- subtitleElement.appendChild(linkElement);
</del><span class="cx">
</span><ins>+ if (showFunctionName) {
+ var separatorElement = document.createElement("span");
+ separatorElement.classList.add("separator");
+ separatorElement.textContent = " — ";
+ subtitleElement.append(separatorElement);
+ }
+
+ subtitleElement.append(linkElement);
+
</ins><span class="cx"> sourceCodeLocation.populateLiveDisplayLocationTooltip(linkElement);
</span><span class="cx"> sourceCodeLocation.populateLiveDisplayLocationString(linkElement, "textContent");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (callFrame.functionName) {
</del><ins>+ var titleElement = document.createElement("span");
+ titleElement.classList.add("title");
+
+ if (showFunctionName) {
</ins><span class="cx"> var imgElement = document.createElement("img");
</span><del>- imgElement.className = "icon";
- callFrameElement.appendChild(imgElement);
</del><ins>+ imgElement.classList.add("icon");
</ins><span class="cx">
</span><del>- var titlesElement = document.createElement("div");
- titlesElement.className = "titles";
- callFrameElement.appendChild(titlesElement);
</del><ins>+ titleElement.append(imgElement, callFrame.functionName || WebInspector.UIString("(anonymous function)"));
+ }
</ins><span class="cx">
</span><del>- var titleElement = document.createElement("span");
- titleElement.className = "title";
- titleElement.textContent = callFrame.functionName;
- titlesElement.appendChild(titleElement);
</del><ins>+ callFrameElement.append(titleElement, subtitleElement);
</ins><span class="cx">
</span><del>- titlesElement.appendChild(subtitleElement);
- } else
- callFrameElement.appendChild(subtitleElement);
-
</del><span class="cx"> return callFrameElement;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -236,11 +236,27 @@
</span><span class="cx"> -webkit-user-select: text;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-message .call-frame {
</del><ins>+.console-message-location.call-frame {
+ display: inline-block;
</ins><span class="cx"> -webkit-user-select: text;
</span><del>- height: 1.2em;
</del><ins>+ max-height: 16px;
+
+ max-width: 50vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.console-message-location.call-frame > .title {
+ max-width: 20vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: inline-block;
+}
+
+.console-message-location.call-frame > .subtitle > .source-link {
+ max-width: 30vw;
+}
+
</ins><span class="cx"> .console-message .go-to-link {
</span><span class="cx"> color: hsla(0, 0%, 0%, 0.6);
</span><span class="cx"> text-decoration: none;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -319,7 +319,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (callFrame) {
</span><del>- var locationElement = new WebInspector.CallFrameView(callFrame);
</del><ins>+ const showFunctionName = !!callFrame.functionName;
+ var locationElement = new WebInspector.CallFrameView(callFrame, showFunctionName);
</ins><span class="cx"> locationElement.classList.add("console-message-location");
</span><span class="cx"> this._element.appendChild(locationElement);
</span><span class="cx">
</span><span class="lines">@@ -377,18 +378,11 @@
</span><span class="cx"> if (this._message.type === WebInspector.ConsoleMessage.MessageType.Trace)
</span><span class="cx"> this.expand();
</span><span class="cx">
</span><del>- this._stackTraceElement = this._element.appendChild(document.createElement("ul"));
- this._stackTraceElement.classList.add("console-message-stack-trace-container");
- this._stackTraceElement.classList.add("console-message-text");
</del><ins>+ this._stackTraceElement = this._element.appendChild(document.createElement("div"));
+ this._stackTraceElement.classList.add("console-message-text", "console-message-stack-trace-container");
</ins><span class="cx">
</span><del>- for (var callFrame of this._message.stackTrace.callFrames) {
- var callFrameElement = this._stackTraceElement.appendChild(document.createElement("li"));
- callFrameElement.classList.add("console-message-stack-trace-call-frame");
- callFrameElement.textContent = callFrame.functionName || WebInspector.UIString("(anonymous function)");
- var url = (callFrame.sourceCodeLocation && callFrame.sourceCodeLocation.sourceCode && callFrame.sourceCodeLocation.sourceCode.url) || "";
- if (url && !this._shouldHideURL(url))
- callFrameElement.appendChild(this._linkifyCallFrame(callFrame));
- }
</del><ins>+ var callFramesElement = new WebInspector.StackTraceView(this._message.stackTrace).element;
+ this._stackTraceElement.appendChild(callFramesElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _createRemoteObjectIfNeeded(parameter)
</span><span class="lines">@@ -486,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> var formatters = {
</span><span class="cx"> "object": this._formatParameterAsObject,
</span><del>- "error": this._formatParameterAsObject,
</del><ins>+ "error": this._formatParameterAsError,
</ins><span class="cx"> "map": this._formatParameterAsObject,
</span><span class="cx"> "set": this._formatParameterAsObject,
</span><span class="cx"> "weakmap": this._formatParameterAsObject,
</span><span class="lines">@@ -527,6 +521,12 @@
</span><span class="cx"> element.appendChild(this._objectTree.element);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _formatParameterAsError(object, element)
+ {
+ var errorObjectView = new WebInspector.ErrorObjectView(object);
+ element.appendChild(errorObjectView.element);
+ }
+
</ins><span class="cx"> _formatParameterAsArray(array, element)
</span><span class="cx"> {
</span><span class="cx"> this._objectTree = new WebInspector.ObjectTreeView(array, WebInspector.ObjectTreeView.Mode.Properties, this._rootPropertyPathForObject(array));
</span><span class="lines">@@ -648,30 +648,6 @@
</span><span class="cx"> return WebInspector.linkifyLocation(url, lineNumber, columnNumber, "console-message-url");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _linkifyCallFrameLocation(url, lineNumber, columnNumber)
- {
- // ConsoleMessage stack trace line numbers are one-based.
- lineNumber = lineNumber ? lineNumber - 1 : 0;
- columnNumber = columnNumber ? columnNumber - 1 : 0;
- return this._linkifyLocation(url, lineNumber, columnNumber);
- }
-
- _linkifyCallFrame(callFrame)
- {
- var url = "";
- var lineNumber = 0;
- var columnNumber = 0;
-
- var sourceCodeLocation = callFrame._sourceCodeLocation;
- if (sourceCodeLocation) {
- lineNumber = sourceCodeLocation.lineNumber;
- columnNumber = sourceCodeLocation.columnNumber;
- url = sourceCodeLocation.sourceCode && sourceCodeLocation.sourceCode.url || "";
- }
-
- return this._linkifyCallFrameLocation(url, lineNumber, columnNumber);
- }
-
</del><span class="cx"> _userProvidedColumnNames(columnNamesArgument)
</span><span class="cx"> {
</span><span class="cx"> if (!columnNamesArgument)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsErrorObjectViewcssfromrev188016trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css (from rev 188016, trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js) (0 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+.error-object::before {
+ display: inline-block;
+ vertical-align: baseline;
+ margin-bottom: -2px;
+ margin-right: 2px;
+ width: 13px;
+ height: 13px;
+ background-image: -webkit-canvas(navigation-sidebar-panel-disclosure-triangle-closed-normal);
+ background-size: 13px 13px;
+ background-repeat: no-repeat;
+ background-position: center;
+ content: "";
+}
+
+.error-object.expanded::before {
+ background-image: -webkit-canvas(navigation-sidebar-panel-disclosure-triangle-open-normal);
+}
+
+.error-object-link-container {
+ color: hsla(0, 0%, 0%, 0.2);
+}
+
+.error-object.expanded > .formatted-error > .error-object-link-container {
+ display: none;
+}
+
+.error-object:not(.expanded) .error-object-outline {
+ display: none;
+}
+
+.error-object-outline {
+ padding-left: 16px
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsErrorObjectViewjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js (0 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -0,0 +1,143 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.ErrorObjectView = class ErrorObjectView extends WebInspector.Object
+{
+ constructor(object)
+ {
+ super();
+
+ console.assert(object instanceof WebInspector.RemoteObject && object.subtype === "error", object);
+
+ this._object = object;
+
+ this._element = document.createElement("div");
+ this._element.classList.add("error-object");
+ var previewElement = WebInspector.FormattedValue.createElementForError(this._object);
+ this._element.append(previewElement);
+ previewElement.addEventListener("click", this._handlePreviewOrTitleElementClick.bind(this));
+
+ this._outlineElement = this._element.appendChild(document.createElement("div"));
+ this._outlineElement.classList.add("error-object-outline");
+ this._outline = new WebInspector.TreeOutline(this._outlineElement);
+ }
+
+ // Static
+
+ static makeSourceLinkWithPrefix(sourceURL, lineNumber, columnNumber)
+ {
+ if (!sourceURL)
+ return null;
+
+ var span = document.createElement("span");
+ span.classList.add("error-object-link-container");
+ span.textContent = " — ";
+
+ var a = WebInspector.linkifyLocation(sourceURL, parseInt(lineNumber) - 1, parseInt(columnNumber));
+ a.classList.add("error-object-link");
+ span.appendChild(a);
+
+ return span;
+ }
+
+ // Public
+
+ get object()
+ {
+ return this._object;
+ }
+
+ get element()
+ {
+ return this._element;
+ }
+
+ get treeOutline()
+ {
+ return this._outline;
+ }
+
+ get expanded()
+ {
+ return this._expanded;
+ }
+
+ update()
+ {
+ this._object.getOwnPropertyDescriptorsAsObject(function(properties) {
+ console.assert(properties && properties.stack && properties.stack.value);
+
+ if (!this._hasStackTrace)
+ this._buildStackTrace(properties.stack.value.value);
+
+ this._hasStackTrace = true;
+ }.bind(this));
+ }
+
+ expand()
+ {
+ if (this._expanded)
+ return;
+
+ this._expanded = true;
+ this._element.classList.add("expanded");
+
+ if (this._previewView)
+ this._previewView.showTitle();
+
+ this.update();
+ }
+
+ collapse()
+ {
+ if (!this._expanded)
+ return;
+
+ this._expanded = false;
+ this._element.classList.remove("expanded");
+
+ if (this._previewView)
+ this._previewView.showPreview();
+ }
+
+ // Private
+
+ _handlePreviewOrTitleElementClick(event)
+ {
+ if (!this._expanded)
+ this.expand();
+ else
+ this.collapse();
+
+ event.stopPropagation();
+ }
+
+ _buildStackTrace(stackString)
+ {
+ var stackTrace = WebInspector.StackTrace.fromString(stackString);
+ var stackTraceElement = new WebInspector.StackTraceView(stackTrace).element;
+ this._outlineElement.appendChild(stackTraceElement);
+ }
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFormattedValuejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js (188016 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js 2015-08-06 03:38:54 UTC (rev 188016)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -65,6 +65,33 @@
</span><span class="cx"> return span;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.FormattedValue.createElementForError = function(object)
+{
+ var span = document.createElement("span");
+ span.classList.add("formatted-error");
+ span.textContent = object.description;
+
+ if (!object.preview)
+ return span;
+
+ function previewToObject(preview)
+ {
+ var result = {};
+ for (var property of preview.propertyPreviews)
+ result[property.name] = property.value;
+
+ return result;
+ }
+
+ var preview = previewToObject(object.preview);
+ if (!preview.sourceURL)
+ return span;
+
+ var sourceLinkWithPrefix = WebInspector.ErrorObjectView.makeSourceLinkWithPrefix(preview.sourceURL, preview.line, preview.column);
+ span.append(sourceLinkWithPrefix);
+ return span;
+};
+
</ins><span class="cx"> WebInspector.FormattedValue.createElementForNodePreview = function(preview)
</span><span class="cx"> {
</span><span class="cx"> var value = preview.value;
</span><span class="lines">@@ -143,7 +170,7 @@
</span><span class="cx"> return span;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Function: if class, show the description, otherwise ellide in previews.
</del><ins>+ // Function: if class, show the description, otherwise elide in previews.
</ins><span class="cx"> if (type === "function") {
</span><span class="cx"> if (subtype === "class")
</span><span class="cx"> span.textContent = displayString;
</span><span class="lines">@@ -185,6 +212,9 @@
</span><span class="cx"> if (object.subtype === "node")
</span><span class="cx"> return WebInspector.FormattedValue.createElementForNode(object);
</span><span class="cx">
</span><ins>+ if (object.subtype === "error")
+ return WebInspector.FormattedValue.createElementForError(object);
+
</ins><span class="cx"> if (object.preview)
</span><span class="cx"> return new WebInspector.ObjectPreviewView(object.preview, previewViewMode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsStackTraceViewcssfromrev188016trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.css (from rev 188016, trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js) (0 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.css (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.css 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+.stack-trace > .call-frame {
+ margin: 1px 0;
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsStackTraceViewjsfromrev188016trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js (from rev 188016, trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js) (0 => 188017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/StackTraceView.js 2015-08-06 03:58:07 UTC (rev 188017)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.StackTraceView = class StackTraceView extends WebInspector.Object
+{
+ constructor(stackTrace)
+ {
+ super();
+
+ var element = this._element = document.createElement("div");
+ element.classList.add("stack-trace");
+
+ for (var callFrame of stackTrace.callFrames) {
+ if (!callFrame.sourceCodeLocation && callFrame.functionName === null)
+ continue;
+
+ var callFrameElement = new WebInspector.CallFrameView(callFrame, true);
+ element.appendChild(callFrameElement);
+ }
+ }
+
+ get element()
+ {
+ return this._element;
+ }
+};
</ins></span></pre>
</div>
</div>
</body>
</html>