<!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>[194942] 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/194942">194942</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-12 17:41:28 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194083">r194083</a>. rdar://problem/24101257</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCallFramejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCallFrameIconscss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameIcons.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCallFrameViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceImagesProgramsvg">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/Program.svg</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceImagesgtkProgramsvg">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/gtk/Program.svg</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 (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194083. rdar://problem/24101257
+
+ 2015-12-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Stack traces in console incorrectly show "(anonymous function)" for global code
+ https://bugs.webkit.org/show_bug.cgi?id=152280
+
+ Reviewed by Brian Burg.
+
+ * inspector/debugger/js-stacktrace-expected.txt:
+ * inspector/debugger/js-stacktrace.html:
+
+2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194908. rdar://problem/24101253
</span><span class="cx">
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@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 (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -6,13 +6,22 @@
</span><span class="cx"> "lineNumber": 15,
</span><span class="cx"> "columnNumber": 22,
</span><span class="cx"> "functionName": "typeError",
</span><del>- "nativeCode": false
</del><ins>+ "nativeCode": false,
+ "programCode": false
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "lineNumber": 6,
</span><span class="cx"> "columnNumber": 21,
</span><span class="cx"> "functionName": "typeErrorWrap",
</span><del>- "nativeCode": false
</del><ins>+ "nativeCode": false,
+ "programCode": false
+ },
+ {
+ "lineNumber": null,
+ "columnNumber": null,
+ "functionName": "eval code",
+ "nativeCode": true,
+ "programCode": true
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -29,6 +38,12 @@
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><span class="cx"> "lineNumber": 7,
</span><span class="cx"> "columnNumber": 21
</span><ins>+ },
+ {
+ "functionName": "eval code",
+ "url": "",
+ "lineNumber": 0,
+ "columnNumber": 0
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -38,19 +53,29 @@
</span><span class="cx"> "lineNumber": 15,
</span><span class="cx"> "columnNumber": 22,
</span><span class="cx"> "functionName": "typeError",
</span><del>- "nativeCode": false
</del><ins>+ "nativeCode": false,
+ "programCode": false
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "lineNumber": null,
</span><span class="cx"> "columnNumber": null,
</span><span class="cx"> "functionName": "map",
</span><del>- "nativeCode": true
</del><ins>+ "nativeCode": true,
+ "programCode": false
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "lineNumber": 22,
</span><span class="cx"> "columnNumber": 20,
</span><span class="cx"> "functionName": "testWithNativeCallInBetween",
</span><del>- "nativeCode": false
</del><ins>+ "nativeCode": false,
+ "programCode": false
+ },
+ {
+ "lineNumber": null,
+ "columnNumber": null,
+ "functionName": "eval code",
+ "nativeCode": true,
+ "programCode": true
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -73,6 +98,12 @@
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><span class="cx"> "lineNumber": 23,
</span><span class="cx"> "columnNumber": 20
</span><ins>+ },
+ {
+ "functionName": "eval code",
+ "url": "",
+ "lineNumber": 0,
+ "columnNumber": 0
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordebuggerjsstacktracehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace.html 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx"> lineNumber: lineNumber,
</span><span class="cx"> columnNumber: columnNumber,
</span><span class="cx"> functionName: callFrame.functionName,
</span><del>- nativeCode: callFrame.nativeCode
</del><ins>+ nativeCode: callFrame.nativeCode,
+ programCode: callFrame.programCode,
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,9 +113,9 @@
</span><span class="cx"> {
</span><span class="cx"> var index = 0;
</span><span class="cx"> for (var frame of stackTrace) {
</span><del>- if (frame.nativeCode && frame.functionName === null)
</del><ins>+ index++;
+ if (frame.nativeCode && frame.functionName === "eval code")
</ins><span class="cx"> break;
</span><del>- index++;
</del><span class="cx"> }
</span><span class="cx"> return stackTrace.slice(0, index);
</span><span class="cx"> }
</span><span class="lines">@@ -123,9 +124,9 @@
</span><span class="cx"> {
</span><span class="cx"> var index = 0;
</span><span class="cx"> for (var frame of payload) {
</span><ins>+ index++;
</ins><span class="cx"> if (frame.functionName === "eval code")
</span><span class="cx"> break;
</span><del>- index++;
</del><span class="cx"> }
</span><span class="cx"> return payload.slice(0, index);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194083. rdar://problem/24101257
+
+ 2015-12-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Stack traces in console incorrectly show "(anonymous function)" for global code
+ https://bugs.webkit.org/show_bug.cgi?id=152280
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Images/Program.svg: Added.
+ * UserInterface/Images/gtk/Program.svg: Added.
+ Copied from TimelineRecordScriptEvaluated.svg.
+
+ * UserInterface/Models/CallFrame.js:
+ (WebInspector.CallFrame):
+ (WebInspector.CallFrame.prototype.get programCode):
+ Add a new property to check if this call frame is in program code.
+
+ (WebInspector.CallFrame.fromPayload):
+ Detect different sources of program code (global, eval, module).
+
+ * UserInterface/Views/CallFrameIcons.css:
+ (.program-icon .icon):
+ * UserInterface/Views/CallFrameView.js:
+ (WebInspector.CallFrameView.iconClassNameForCallFrame):
+ Give program code the [S] global script icon like in profiles.
+
+2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194066. rdar://problem/24101252
</span><span class="cx">
</span><span class="cx"> 2015-12-14 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceImagesProgramsvg"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/Program.svg (0 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/Program.svg (rev 0)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/Program.svg 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <path fill="rgb(190, 165, 202)" d="M 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 L 3 1 Z M 3 1"/>
+ <path fill="rgb(141, 118, 153)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/>
+ <path fill="rgb(153, 127, 166)" d="M 5.19849793 12.6584609 C 5.2831472 12.676395 6.98277851 12.9487305 7.62939453 12.9487305 C 8.79640591 12.9487305 9.76331344 12.6806542 10.5034462 12.1146703 C 11.3037555 11.5026691 11.7177734 10.6286312 11.7177734 9.58544922 C 11.7177734 8.84534902 11.4998181 8.18341061 11.0628295 7.63852362 C 10.6767371 7.15709971 10.0557113 6.69185669 9.18734192 6.20492057 L 8.61524891 5.88648574 C 8.27558142 5.69523066 8.15431716 5.69238281 8.23632812 5.69238281 C 8.56703836 5.69238281 9.10333246 5.81936052 9.8138795 6.08542439 L 11.1645508 6.59118236 L 11.1645508 5.14892578 L 11.1645508 3.87597656 L 11.1645508 3.07965768 L 10.3884483 2.90136387 C 9.52406853 2.70279014 8.73593121 2.60205078 8.02148438 2.60205078 C 7.01081351 2.60205078 6.14909735 2.87110984 5.47554965 3.42697448 C 4.76046595 4.01711791 4.38964844 4.82767811 4.38964844 5.77734375 C 4.38964844 6.49239045 4.61205052 7.14196725 5.04920932 7.68841575 C 5.43639142 8.1723
9338 6.03437082 8.62885808 6.84888633 9.08727887 L 7.38545082 9.38538774 C 7.71699471 9.57330366 7.92926232 9.72631865 7.99164827 9.79813503 C 7.94460492 9.81851991 7.82252674 9.85302734 7.60253906 9.85302734 C 7.14294036 9.85302734 6.53493744 9.70437137 5.79174704 9.39341305 L 4.40576172 8.81350287 L 4.40576172 10.315918 L 4.40576172 11.6801758 L 4.40576172 12.4905083 L 5.19849793 12.6584609 C 5.52713094 12.7280865 5.52713094 12.7280865 5.57407851 12.738033 L 5.19849793 12.6584609 Z M 5.19849793 12.6584609"/>
+ <path fill="white" d="M 5.40576172 11.6801758 L 5.40576172 10.315918 C 6.26156027 10.6739927 6.99381206 10.8530273 7.60253906 10.8530273 C 8.02864796 10.8530273 8.36433797 10.758139 8.60961914 10.5683594 C 8.85490031 10.3785798 8.97753906 10.1207699 8.97753906 9.79492188 C 8.97753906 9.53710809 8.90055416 9.31958096 8.74658203 9.14233398 C 8.59260991 8.965087 8.3007834 8.75472127 7.87109375 8.51123047 L 7.33935547 8.21582031 C 6.6267868 7.81477664 6.12369938 7.43074728 5.83007812 7.0637207 C 5.53645687 6.69669413 5.38964844 6.2679061 5.38964844 5.77734375 C 5.38964844 5.12206704 5.63045007 4.59570511 6.11206055 4.19824219 C 6.59367103 3.80077926 7.23013927 3.60205078 8.02148438 3.60205078 C 8.65527661 3.60205078 9.36962493 3.69335846 10.1645508 3.87597656 L 10.1645508 5.14892578 C 9.3517212 4.84456228 8.70898674 4.69238281 8.23632812 4.69238281 C 7.87109192 4.69238281 7.57837024 4.77384359 7.3581543 4.93676758 C 7.13793835 5.09969157 7.02783203 5.313638
7.02783203 5.57861328 C 7.02783203 5.79703885 7.10481694 5.98860595 7.25878906 6.15332031 C 7.41276119 6.31803468 7.70279735 6.52034385 8.12890625 6.76025391 L 8.69824219 7.07714844 C 9.46452206 7.50683809 9.99267433 7.9025047 10.2827148 8.26416016 C 10.5727554 8.62581561 10.7177734 9.06624089 10.7177734 9.58544922 C 10.7177734 10.3230831 10.4438504 10.9013651 9.89599609 11.3203125 C 9.34814179 11.7392599 8.59261549 11.9487305 7.62939453 11.9487305 C 6.99202155 11.9487305 6.25081803 11.8592131 5.40576172 11.6801758 C 5.40576172 11.6801758 6.25081803 11.8592131 5.40576172 11.6801758 L 5.40576172 11.6801758 L 5.40576172 11.6801758 Z M 5.40576172 11.6801758"/>
+</svg>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceImagesgtkProgramsvg"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/gtk/Program.svg (0 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/gtk/Program.svg (rev 0)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/gtk/Program.svg 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <defs>
+ <linearGradient id="d" x1="491.22" x2="491.22" y1="506.65" y2="732.05" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.093294 0 0 .093294 -35.871 -43.769)">
+ <stop stop-color="#5c3566" offset="0"/>
+ <stop stop-color="#ddc9db" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" cx="301" cy="51.5" r="19.5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.97063 1.9684e-8 0 .28611 -291.16 -14.63)">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="a" cx="24.446" cy="35.878" r="20.531" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.85696 3.2529e-7 -1.253e-7 .33010 -12.949 .77181)">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#e4d4e2" offset="1"/>
+ </radialGradient>
+ <linearGradient id="c" x1="321.57" x2="311.65" y1="145.52" y2="118.5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.55569 0 0 .55568 -169.27 -70.906)">
+ <stop stop-color="#5c3566" offset="0"/>
+ <stop stop-color="#ddc9db" offset="1"/>
+ </linearGradient>
+ </defs>
+ <rect width="15.004" height="15.003" x=".49815" y=".49833" fill="url(#a)" fill-rule="evenodd" stroke="url(#c)" stroke-miterlimit="10" rx="1.5143" ry="1.5143" stroke-linejoin="bevel"/>
+ <rect width="12.997" height="13" x="1.5014" y="1.5016" fill="none" stroke="#fff" stroke-miterlimit="10" ry=".50810" stroke-linejoin="bevel" rx=".50812"/>
+ <rect width="14" height="14" x="1.0017" y="1.0016" fill="url(#b)" fill-rule="evenodd" rx="1.9062" ry="1.9062"/>
+ <path fill="#fff" d="m8.154 4.7563c-0.9594 0-1.7722 0.24647-2.3438 0.6875-0.57159 0.44103-0.875 1.0875-0.875 1.8125 0 0.76738 0.30008 1.3618 0.75 1.75 0.44992 0.38821 1.0123 0.59908 1.5625 0.78125 0.55019 0.18217 1.1026 0.32786 1.4687 0.5 0.18307 0.08607 0.32533 0.18927 0.40625 0.28125s0.09673 0.15012 0.09375 0.28125c0 0.18652-0.09038 0.35419-0.34375 0.5s-0.67085 0.25-1.1562 0.25c-0.38979 0-1.0737-0.12598-2.0938-0.5l-0.1875-0.0625a0.25002 0.25002 0 0 0 -0.09375 -0.03125 0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.15625 0.125 0.25002 0.25002 0 0 0 -0.03125 0.03125l-0.46875 1.3125a0.25002 0.25002 0 0 0 -0.03125 0.03125 0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.03125 0.09375 0.25002 0.25002 0 0 0 0.03125 0.0625 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.03125 0l0.1875 0.09375v-0.03125c0.77838 0.30206 1.5983 0.59375 2.6562 0.59375 1.2747 0 2.1718-0.32057 2.75-0.8125 0.57818-0.491
93 0.8125-1.1637 0.8125-1.7812 0-0.75379-0.30407-1.2962-0.75-1.6875-0.4456-0.3912-1.0134-0.6241-1.5622-0.8124s-1.097-0.3332-1.4688-0.5c-0.18586-0.083381-0.32338-0.165-0.40625-0.25-0.08287-0.085001-0.125-0.17508-0.125-0.28125 0-0.20152 0.09694-0.33345 0.3125-0.46875s0.58083-0.25 1.0312-0.25c0.6839 0 1.2751 0.18955 1.9062 0.4375a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.09375 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.03125l0.4375-1.2813a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.0625 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125l-0.15625-0.0625a0.25002 0.25002 0 0 0 -0.03125 0c-0.29122-0.093605-1.1271-0.46875-2.4375-0.46875z" display="block"/>
+ <path fill="url(#d)" d="m8.2058 3.726c-0.9594 0-1.7722 0.24647-2.3438 0.6875-0.57159 0.44103-0.875 1.0875-0.875 1.8125 0 0.76738 0.30008 1.3618 0.75 1.75 0.44992 0.38821 1.0123 0.59908 1.5625 0.78125 0.55019 0.18217 1.1026 0.32786 1.4687 0.5 0.18307 0.086072 0.32533 0.18927 0.40625 0.28125 0.08092 0.091977 0.09673 0.15012 0.09375 0.28125 0 0.18652-0.09038 0.35419-0.34375 0.5s-0.67085 0.25-1.1562 0.25c-0.38979 0-1.0737-0.12598-2.0938-0.5l-0.1875-0.0625a0.25002 0.25002 0 0 0 -0.09375 -0.03125 0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.15625 0.125 0.25002 0.25002 0 0 0 -0.03125 0.03125l-0.46875 1.3125a0.25002 0.25002 0 0 0 -0.03125 0.03125 0.25002 0.25002 0 0 0 0 0.0625 0.25002 0.25002 0 0 0 0.03125 0.09375 0.25002 0.25002 0 0 0 0.03125 0.0625 0.25002 0.25002 0 0 0 0.03125 0.03125 0.25002 0.25002 0 0 0 0.0625 0.03125 0.25002 0.25002 0 0 0 0.03125 0l0.1875 0.09375v-0.03125c0.77838 0.30206 1.5983 0.59375 2.6562 0.59375 1.2747 0 2.1718-0.32057 2.75
-0.8125 0.57818-0.49193 0.8125-1.1637 0.8125-1.7812 0-0.75379-0.30407-1.2962-0.75-1.6875-0.446-0.3916-1.0136-0.6244-1.5624-0.8127-0.5488-0.1884-1.097-0.3333-1.4688-0.5-0.18586-0.083381-0.32338-0.165-0.40625-0.25-0.08287-0.085001-0.125-0.17508-0.125-0.28125 0-0.20152 0.09694-0.33345 0.3125-0.46875s0.58083-0.25 1.0312-0.25c0.6839 0 1.2751 0.18955 1.9062 0.4375a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.09375 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.03125l0.4375-1.2813a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.0625 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125l-0.15625-0.0625a0.25002 0.25002 0 0 0 -0.03125 0c-0.29122-0.093605-1.1271-0.46875-2.4375-0.46875z" display="block"/>
+</svg>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CallFrame = class CallFrame extends WebInspector.Object
</span><span class="cx"> {
</span><del>- constructor(id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode)
</del><ins>+ constructor(id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode, programCode)
</ins><span class="cx"> {
</span><span class="cx"> super();
</span><span class="cx">
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> this._thisObject = thisObject || null;
</span><span class="cx"> this._scopeChain = scopeChain || [];
</span><span class="cx"> this._nativeCode = nativeCode || false;
</span><ins>+ this._programCode = programCode || false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -63,6 +64,11 @@
</span><span class="cx"> return this._nativeCode;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get programCode()
+ {
+ return this._programCode;
+ }
+
</ins><span class="cx"> get thisObject()
</span><span class="cx"> {
</span><span class="cx"> return this._thisObject;
</span><span class="lines">@@ -108,6 +114,7 @@
</span><span class="cx">
</span><span class="cx"> var url = payload.url;
</span><span class="cx"> var nativeCode = false;
</span><ins>+ var programCode = false;
</ins><span class="cx"> var sourceCodeLocation = null;
</span><span class="cx">
</span><span class="cx"> if (!url || url === "[native code]") {
</span><span class="lines">@@ -125,10 +132,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var functionName = null;
- if (payload.functionName !== "global code" && payload.functionName !== "eval code")
- functionName = payload.functionName;
</del><ins>+ var functionName = payload.functionName;
+ if (payload.functionName === "global code"
+ || payload.functionName === "eval code"
+ || payload.functionName === "module code")
+ programCode = true;
</ins><span class="cx">
</span><del>- return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode);
</del><ins>+ return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode, programCode);
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCallFrameIconscss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameIcons.css (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameIcons.css 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameIcons.css 2016-01-13 01:41:28 UTC (rev 194942)
</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>+.program-icon .icon {
+ content: url(../Images/Program.svg);
+}
+
</ins><span class="cx"> .function-icon .icon {
</span><span class="cx"> content: url(../Images/Function.svg);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCallFrameViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js (194941 => 194942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js 2016-01-13 01:41:23 UTC (rev 194941)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js 2016-01-13 01:41:28 UTC (rev 194942)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx">
</span><span class="cx"> static iconClassNameForCallFrame(callFrame)
</span><span class="cx"> {
</span><ins>+ if (callFrame.programCode)
+ return WebInspector.CallFrameView.ProgramIconStyleClassName;
+
</ins><span class="cx"> // This is more than likely an event listener function with an "on" prefix and it is
</span><span class="cx"> // as long or longer than the shortest event listener name -- "oncut".
</span><span class="cx"> if (callFrame.functionName && callFrame.functionName.startsWith("on") && callFrame.functionName.length >= 5)
</span><span class="lines">@@ -87,6 +90,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.CallFrameView.ProgramIconStyleClassName = "program-icon";
</ins><span class="cx"> WebInspector.CallFrameView.FunctionIconStyleClassName = "function-icon";
</span><span class="cx"> WebInspector.CallFrameView.EventListenerIconStyleClassName = "event-listener-icon";
</span><span class="cx"> WebInspector.CallFrameView.NativeIconStyleClassName = "native-icon";
</span></span></pre>
</div>
</div>
</body>
</html>