<!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>[193253] branches/safari-601-branch</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/193253">193253</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:02:22 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190780">r190780</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordebuggerjsstacktraceexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordebuggerjsstacktracehtml">branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsStackTracejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193252 => 193253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:02:14 UTC (rev 193252)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:02:22 UTC (rev 193253)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190780. rdar://problem/23221163
+
+ 2015-10-08 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Stack trace view doesn't properly display lines without function names
+ https://bugs.webkit.org/show_bug.cgi?id=149922
+
+ Test an anomymous function.
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/debugger/js-stacktrace-expected.txt: Also, rebaseline one old test.
+ * inspector/debugger/js-stacktrace.html:
+
+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="branchessafari601branchLayoutTestsinspectordebuggerjsstacktraceexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (193252 => 193253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2015-12-03 19:02:14 UTC (rev 193252)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2015-12-03 19:02:22 UTC (rev 193253)
</span><span class="lines">@@ -71,8 +71,24 @@
</span><span class="cx"> {
</span><span class="cx"> "functionName": "testWithNativeCallInBetween",
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": "23",
- "columnNumber": "20"
</del><ins>+ "lineNumber": 23,
+ "columnNumber": 20
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+Error object:
+[
+ {
+ "functionName": "",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": 31,
+ "columnNumber": 33
+ },
+ {
+ "functionName": "global code",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": 35,
+ "columnNumber": 3
+ }
+]
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordebuggerjsstacktracehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html (193252 => 193253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html 2015-12-03 19:02:14 UTC (rev 193252)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html 2015-12-03 19:02:22 UTC (rev 193253)
</span><span class="lines">@@ -23,7 +23,22 @@
</span><span class="cx"> return [42].map(typeError)[0];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+var _anonymousFunctionError = null;
</ins><span class="cx">
</span><ins>+(function() {
+ var object = {};
+ try {
+ object.methodDoesntExist();
+ } catch (e) {
+ _anonymousFunctionError = e.stack;
+ }
+})();
+
+function getAnonymousFunctionError() {
+ return _anonymousFunctionError;
+}
+
+
</ins><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, function(event) {
</span><span class="lines">@@ -71,6 +86,19 @@
</span><span class="cx"> InspectorTest.completeTest();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ InspectorTest.evaluateInPage("getAnonymousFunctionError()", 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();
+ });
+
</ins><span class="cx"> function stripFilePaths(stackTrace)
</span><span class="cx"> {
</span><span class="cx"> for (var frame of stackTrace) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193252 => 193253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:02:14 UTC (rev 193252)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:02:22 UTC (rev 193253)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190780. rdar://problem/23221163
+
+ 2015-10-08 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Stack trace view doesn't properly display lines without function names
+ https://bugs.webkit.org/show_bug.cgi?id=149922
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/StackTrace.js:
+ (WebInspector.StackTrace._parseStackTrace):
+ (WebInspector.StackTrace._parseLocation): Added.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r190727. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-08 Nikita Vasilyev <nvasilyev@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js (193252 => 193253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2015-12-03 19:02:14 UTC (rev 193252)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2015-12-03 19:02:22 UTC (rev 193253)
</span><span class="lines">@@ -58,24 +58,14 @@
</span><span class="cx"> var url = "";
</span><span class="cx"> var lineNumber = 0;
</span><span class="cx"> var columnNumber = 0;
</span><ins>+ var atIndex = line.indexOf("@");
</ins><span class="cx">
</span><del>- 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 = parseInt(url.slice(columnIndex + 1));
-
- url = url.slice(0, columnIndex);
- var lineIndex = url.lastIndexOf(":", columnIndex);
- if (lineIndex !== -1) {
- lineNumber = parseInt(url.slice(lineIndex + 1, columnIndex));
- url = url.slice(0, lineIndex);
- }
- }
- } else
</del><ins>+ if (atIndex !== -1) {
+ functionName = line.slice(0, atIndex);
+ ({url, lineNumber, columnNumber} = WebInspector.StackTrace._parseLocation(line.slice(atIndex + 1)));
+ } else if (line.includes("/"))
+ ({url, lineNumber, columnNumber} = WebInspector.StackTrace._parseLocation(line));
+ else
</ins><span class="cx"> functionName = line;
</span><span class="cx">
</span><span class="cx"> result.push({functionName, url, lineNumber, columnNumber});
</span><span class="lines">@@ -84,6 +74,26 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static _parseLocation(locationString)
+ {
+ var result = {url: "", lineNumber: 0, columnNumber: 0};
+ var locationRegEx = /(.+?)(?::(\d+)(?::(\d+))?)?$/;
+ var matched = locationString.match(locationRegEx);
+
+ if (!matched)
+ return result;
+
+ result.url = matched[1];
+
+ if (matched[2])
+ result.lineNumber = parseInt(matched[2]);
+
+ if (matched[3])
+ result.columnNumber = parseInt(matched[3]);
+
+ return result;
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get callFrames()
</span></span></pre>
</div>
</div>
</body>
</html>