<!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>[199852] 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/199852">199852</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-21 17:50:09 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: sourceMappingURL not loaded in generated script
https://bugs.webkit.org/show_bug.cgi?id=156022
<rdar://problem/25438595>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-21
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):
Synthetic CallFrames for native code will not have script identifiers.
* inspector/ScriptCallFrame.cpp:
(Inspector::ScriptCallFrame::ScriptCallFrame):
(Inspector::ScriptCallFrame::isEqual):
(Inspector::ScriptCallFrame::buildInspectorObject):
* inspector/ScriptCallFrame.h:
* inspector/protocol/Console.json:
Include the script identifier in ScriptCallFrame so we can correlate this
to the exactly script, even if there isn't a URL. The Script may have a
sourceURL, so the Web Inspector frontend may decide to show / link to it.
* inspector/ScriptCallStackFactory.cpp:
(Inspector::CreateScriptCallStackFunctor::operator()):
(Inspector::createScriptCallStackFromException):
Include SourceID when we have it.
* interpreter/Interpreter.cpp:
(JSC::GetStackTraceFunctor::operator()):
* interpreter/Interpreter.h:
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::Frame::sourceID):
* interpreter/StackVisitor.h:
Access the SourceID when we have it.
Source/WebInspectorUI:
* UserInterface/Controllers/SourceMapManager.js:
(WebInspector.SourceMapManager.prototype.downloadSourceMap):
If the sourceMapURL is a dataURL at this point, we can just pass it on,
otherwise we would have returned and skipped it.
* UserInterface/Models/CallFrame.js:
(WebInspector.CallFrame.fromPayload):
Add handling for "scriptId" if it is available in the Console.CallFrame.
Don't automatically mark CallFrames that didn't have a "url" as native,
instead try to get a SourceCode.
* UserInterface/Models/Script.js:
(WebInspector.Script.prototype.get displayURL):
Used by SourceCodeLocation formatting, so behave more like Resources
when we have only have a sourceURL name. This produces output like:
"foo.js:#:#" instead of "foo.js (line #:#)"
(WebInspector.Script.prototype.get anonymous):
Easy accessor to see if this would be treated as anonymous or not.
* UserInterface/Models/SourceMap.js:
(WebInspector.SourceMap.prototype.get sourceMappingBasePathURLComponents):
Gracefully handle no path.
* UserInterface/Models/StackTrace.js:
(WebInspector.StackTrace.prototype.get firstNonNativeCallFrame):
(WebInspector.StackTrace.prototype.get firstNonNativeNonAnonymousCallFrame):
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._appendLocationLink):
Now that "Eval Code" with a sourceURL is no longer native, we still don't
want to show it in the Web Inspector if it is anonymous. So include a stricter
version that skips native and anonymous call frames.
LayoutTests:
* inspector/console/messageAdded-from-named-evaluations-expected.txt: Added.
* inspector/console/messageAdded-from-named-evaluations.html: Added.
* inspector/debugger/js-stacktrace-expected.txt:
* inspector/model/stack-trace-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerjsstacktraceexpectedtxt">trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelstacktraceexpectedtxt">trunk/LayoutTests/inspector/model/stack-trace-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolConsolejson">trunk/Source/JavaScriptCore/inspector/protocol/Console.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorh">trunk/Source/JavaScriptCore/interpreter/StackVisitor.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersSourceMapManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptjs">trunk/Source/WebInspectorUI/UserInterface/Models/Script.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceMapjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs">trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorconsolemessageAddedfromnamedevaluationsexpectedtxt">trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolemessageAddedfromnamedevaluationshtml">trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/LayoutTests/ChangeLog 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: sourceMappingURL not loaded in generated script
+ https://bugs.webkit.org/show_bug.cgi?id=156022
+ <rdar://problem/25438595>
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/console/messageAdded-from-named-evaluations-expected.txt: Added.
+ * inspector/console/messageAdded-from-named-evaluations.html: Added.
+ * inspector/debugger/js-stacktrace-expected.txt:
+ * inspector/model/stack-trace-expected.txt:
+
</ins><span class="cx"> 2016-04-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: accumulation == TransformState::FlattenTransform in WebCore::GraphicsLayerCA::computeVisibleAndCoverageRect
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolemessageAddedfromnamedevaluationsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations-expected.txt (0 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations-expected.txt 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+CONSOLE MESSAGE: line 2: inside named-eval.js
+CONSOLE MESSAGE: line 3: TypeError: undefined is not an object (evaluating '({}).x.x')
+Console messages in named evaluations should have call frames with the correct name.
+
+
+== Running test suite: Console.messageAdded.messageFromNamedEvaluations
+-- Running test case: TriggerMessageFromNameEvaluation
+PASS: Log ConsoleMessage top call frame should have sourceURL name.
+
+-- Running test case: TriggerExceptionFromNameFunctionConstructorEvaluation
+Uncaught exception in test page: TypeError: undefined is not an object (evaluating '({}).x.x') [undefined:3]
+PASS: Exception ConsoleMessage top call frame should have sourceURL name.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolemessageAddedfromnamedevaluationshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html (0 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html (rev 0)
+++ trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+TestPage.allowUncaughtExceptions = true;
+
+function triggerMessageFromNamedEvaluation() {
+ eval("//# sourceURL=named-eval.js\nconsole.log('inside named-eval.js')");
+}
+
+function triggerExceptionFromNamedFunctionConstructorEvaluation() {
+ Function("//# sourceURL=named-function-constructor.js\n({}).x.x")();
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Console.messageAdded.messageFromNamedEvaluations");
+
+ suite.addTestCase({
+ name: "TriggerMessageFromNameEvaluation",
+ description: "Message from named evaluation should have a source location.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("triggerMessageFromNamedEvaluation()");
+ WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+ let message = event.data.message;
+ let topCallFrame = message.stackTrace.callFrames[0];
+ InspectorTest.expectThat(topCallFrame.sourceCodeLocation.sourceCode.displayName === "named-eval.js", "Log ConsoleMessage top call frame should have sourceURL name.");
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "TriggerExceptionFromNameFunctionConstructorEvaluation",
+ description: "Exception message from named Function constructor evaluation should have a source location.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("setTimeout(triggerExceptionFromNamedFunctionConstructorEvaluation)");
+ WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+ let message = event.data.message;
+ let topCallFrame = message.stackTrace.callFrames[0];
+ InspectorTest.expectThat(topCallFrame.sourceCodeLocation.sourceCode.displayName === "named-function-constructor.js", "Exception ConsoleMessage top call frame should have sourceURL name.");
+ resolve();
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Console messages in named evaluations should have call frames with the correct name.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerjsstacktraceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -17,10 +17,10 @@
</span><span class="cx"> "programCode": false
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "lineNumber": null,
- "columnNumber": null,
</del><ins>+ "lineNumber": 0,
+ "columnNumber": 14,
</ins><span class="cx"> "functionName": "Eval Code",
</span><del>- "nativeCode": true,
</del><ins>+ "nativeCode": false,
</ins><span class="cx"> "programCode": true
</span><span class="cx"> }
</span><span class="cx"> ]
</span><span class="lines">@@ -71,10 +71,10 @@
</span><span class="cx"> "programCode": false
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "lineNumber": null,
- "columnNumber": null,
</del><ins>+ "lineNumber": 0,
+ "columnNumber": 28,
</ins><span class="cx"> "functionName": "Eval Code",
</span><del>- "nativeCode": true,
</del><ins>+ "nativeCode": false,
</ins><span class="cx"> "programCode": true
</span><span class="cx"> }
</span><span class="cx"> ]
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelstacktraceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/stack-trace-expected.txt (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/stack-trace-expected.txt 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/LayoutTests/inspector/model/stack-trace-expected.txt 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -9,15 +9,15 @@
</span><span class="cx"> PASS: CallFrame in StackTrace has no thisObject.
</span><span class="cx"> PASS: CallFrame in StackTrace has no scopeChain.
</span><span class="cx"> StackTrace: 11
</span><del>- 1: foo - nativeCode (true) programCode (false)
- 2: Eval Code - nativeCode (true) programCode (true)
</del><ins>+ 1: foo (Anonymous Script 1 (line 1)) - nativeCode (false) programCode (false)
+ 2: Eval Code (Anonymous Script 1 (line 1)) - nativeCode (false) programCode (true)
</ins><span class="cx"> 3: eval - nativeCode (true) programCode (false)
</span><span class="cx"> 4: Global Code (stack-trace.html:2) - nativeCode (false) programCode (true)
</span><span class="cx"> 5: appendChild - nativeCode (true) programCode (false)
</span><span class="cx"> 6: triggerConsoleMessage (stack-trace.html:9) - nativeCode (false) programCode (false)
</span><del>- 7: Eval Code - nativeCode (true) programCode (true)
</del><ins>+ 7: Eval Code (Anonymous Script 2 (line 1)) - nativeCode (false) programCode (true)
</ins><span class="cx"> 8: eval - nativeCode (true) programCode (false)
</span><del>- 9: _evaluateOn - nativeCode (true) programCode (false)
- 10: _evaluateAndWrap - nativeCode (true) programCode (false)
- 11: evaluate - nativeCode (true) programCode (false)
</del><ins>+ 9: _evaluateOn (__WebInspectorInjectedScript__:115) - nativeCode (false) programCode (false)
+ 10: _evaluateAndWrap (__WebInspectorInjectedScript__:93:106) - nativeCode (false) programCode (false)
+ 11: evaluate (__WebInspectorInjectedScript__:83) - nativeCode (false) programCode (false)
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-04-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: sourceMappingURL not loaded in generated script
+ https://bugs.webkit.org/show_bug.cgi?id=156022
+ <rdar://problem/25438595>
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):
+ Synthetic CallFrames for native code will not have script identifiers.
+
+ * inspector/ScriptCallFrame.cpp:
+ (Inspector::ScriptCallFrame::ScriptCallFrame):
+ (Inspector::ScriptCallFrame::isEqual):
+ (Inspector::ScriptCallFrame::buildInspectorObject):
+ * inspector/ScriptCallFrame.h:
+ * inspector/protocol/Console.json:
+ Include the script identifier in ScriptCallFrame so we can correlate this
+ to the exactly script, even if there isn't a URL. The Script may have a
+ sourceURL, so the Web Inspector frontend may decide to show / link to it.
+
+ * inspector/ScriptCallStackFactory.cpp:
+ (Inspector::CreateScriptCallStackFunctor::operator()):
+ (Inspector::createScriptCallStackFromException):
+ Include SourceID when we have it.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::GetStackTraceFunctor::operator()):
+ * interpreter/Interpreter.h:
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::Frame::sourceID):
+ * interpreter/StackVisitor.h:
+ Access the SourceID when we have it.
+
</ins><span class="cx"> 2016-04-21 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Lets do less locking of symbol tables in the BytecodeGenerator where we don't have race conditions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -207,9 +207,9 @@
</span><span class="cx"> if (mangledName)
</span><span class="cx"> cxaDemangled = abi::__cxa_demangle(mangledName, nullptr, nullptr, nullptr);
</span><span class="cx"> if (mangledName || cxaDemangled)
</span><del>- callStack->append(ScriptCallFrame(cxaDemangled ? cxaDemangled : mangledName, ASCIILiteral("[native code]"), 0, 0));
</del><ins>+ callStack->append(ScriptCallFrame(cxaDemangled ? cxaDemangled : mangledName, ASCIILiteral("[native code]"), noSourceID, 0, 0));
</ins><span class="cx"> else
</span><del>- callStack->append(ScriptCallFrame(ASCIILiteral("?"), ASCIILiteral("[native code]"), 0, 0));
</del><ins>+ callStack->append(ScriptCallFrame(ASCIILiteral("?"), ASCIILiteral("[native code]"), noSourceID, 0, 0));
</ins><span class="cx"> free(cxaDemangled);
</span><span class="cx"> }
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -36,9 +36,10 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column)
</del><ins>+ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scriptName, JSC::SourceID sourceID, unsigned lineNumber, unsigned column)
</ins><span class="cx"> : m_functionName(functionName)
</span><span class="cx"> , m_scriptName(scriptName)
</span><ins>+ , m_sourceID(sourceID)
</ins><span class="cx"> , m_lineNumber(lineNumber)
</span><span class="cx"> , m_column(column)
</span><span class="cx"> {
</span><span class="lines">@@ -50,6 +51,8 @@
</span><span class="cx">
</span><span class="cx"> bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const
</span><span class="cx"> {
</span><ins>+ // Ignore sourceID in isEqual in case of identical scripts executed multiple times
+ // that would get different script identifiers, but are otherwise the same.
</ins><span class="cx"> return m_functionName == o.m_functionName
</span><span class="cx"> && m_scriptName == o.m_scriptName
</span><span class="cx"> && m_lineNumber == o.m_lineNumber
</span><span class="lines">@@ -61,6 +64,7 @@
</span><span class="cx"> return Inspector::Protocol::Console::CallFrame::create()
</span><span class="cx"> .setFunctionName(m_functionName)
</span><span class="cx"> .setUrl(m_scriptName)
</span><ins>+ .setScriptId(String::number(m_sourceID))
</ins><span class="cx"> .setLineNumber(m_lineNumber)
</span><span class="cx"> .setColumnNumber(m_column)
</span><span class="cx"> .release();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -32,21 +32,23 @@
</span><span class="cx"> #ifndef ScriptCallFrame_h
</span><span class="cx"> #define ScriptCallFrame_h
</span><span class="cx">
</span><ins>+#include "DebuggerPrimitives.h"
+#include "InspectorProtocolObjects.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><del>-#include "InspectorProtocolObjects.h"
</del><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE ScriptCallFrame {
</span><span class="cx"> public:
</span><del>- ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column);
</del><ins>+ ScriptCallFrame(const String& functionName, const String& scriptName, JSC::SourceID sourceID, unsigned lineNumber, unsigned column);
</ins><span class="cx"> ~ScriptCallFrame();
</span><span class="cx">
</span><span class="cx"> const String& functionName() const { return m_functionName; }
</span><span class="cx"> const String& sourceURL() const { return m_scriptName; }
</span><span class="cx"> unsigned lineNumber() const { return m_lineNumber; }
</span><span class="cx"> unsigned columnNumber() const { return m_column; }
</span><ins>+ JSC::SourceID sourceID() const { return m_sourceID; }
</ins><span class="cx">
</span><span class="cx"> bool isEqual(const ScriptCallFrame&) const;
</span><span class="cx">
</span><span class="lines">@@ -55,6 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> String m_functionName;
</span><span class="cx"> String m_scriptName;
</span><ins>+ JSC::SourceID m_sourceID;
</ins><span class="cx"> unsigned m_lineNumber;
</span><span class="cx"> unsigned m_column;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> unsigned line;
</span><span class="cx"> unsigned column;
</span><span class="cx"> visitor->computeLineAndColumn(line, column);
</span><del>- m_frames.append(ScriptCallFrame(visitor->functionName(), visitor->sourceURL(), line, column));
</del><ins>+ m_frames.append(ScriptCallFrame(visitor->functionName(), visitor->sourceURL(), static_cast<SourceID>(visitor->sourceID()), line, column));
</ins><span class="cx">
</span><span class="cx"> m_remainingCapacityForFrameCapture--;
</span><span class="cx"> return StackVisitor::Continue;
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> unsigned column;
</span><span class="cx"> stackTrace[i].computeLineAndColumn(line, column);
</span><span class="cx"> String functionName = stackTrace[i].friendlyFunctionName(exec);
</span><del>- frames.append(ScriptCallFrame(functionName, stackTrace[i].friendlySourceURL(), line, column));
</del><ins>+ frames.append(ScriptCallFrame(functionName, stackTrace[i].friendlySourceURL(), static_cast<SourceID>(stackTrace[i].sourceID), line, column));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fallback to getting at least the line and sourceURL from the exception object if it has values and the exceptionStack doesn't.
</span><span class="lines">@@ -155,12 +155,12 @@
</span><span class="cx"> String exceptionSourceURL;
</span><span class="cx"> if (!frames.size()) {
</span><span class="cx"> extractSourceInformationFromException(exec, exceptionObject, &lineNumber, &columnNumber, &exceptionSourceURL);
</span><del>- frames.append(ScriptCallFrame(String(), exceptionSourceURL, lineNumber, columnNumber));
</del><ins>+ frames.append(ScriptCallFrame(String(), exceptionSourceURL, noSourceID, lineNumber, columnNumber));
</ins><span class="cx"> } else {
</span><span class="cx"> if (stackTrace[0].sourceURL.isEmpty()) {
</span><span class="cx"> const ScriptCallFrame& firstCallFrame = frames.first();
</span><span class="cx"> extractSourceInformationFromException(exec, exceptionObject, &lineNumber, &columnNumber, &exceptionSourceURL);
</span><del>- frames[0] = ScriptCallFrame(firstCallFrame.functionName(), exceptionSourceURL, lineNumber, columnNumber);
</del><ins>+ frames[0] = ScriptCallFrame(firstCallFrame.functionName(), exceptionSourceURL, stackTrace[0].sourceID, lineNumber, columnNumber);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolConsolejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Console.json (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Console.json 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Console.json 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "functionName", "type": "string", "description": "JavaScript function name." },
</span><span class="cx"> { "name": "url", "type": "string", "description": "JavaScript script name or url." },
</span><ins>+ { "name": "scriptId", "$ref": "Debugger.ScriptId", "description": "Script identifier." },
</ins><span class="cx"> { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." },
</span><span class="cx"> { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." }
</span><span class="cx"> ]
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -561,11 +561,12 @@
</span><span class="cx"> codeBlock->firstLineColumnOffset(),
</span><span class="cx"> codeBlock->sourceOffset(),
</span><span class="cx"> visitor->bytecodeOffset(),
</span><del>- visitor->sourceURL()
</del><ins>+ visitor->sourceURL(),
+ visitor->sourceID(),
</ins><span class="cx"> };
</span><span class="cx"> m_results.append(s);
</span><span class="cx"> } else {
</span><del>- StackFrame s = { Strong<JSObject>(vm, visitor->callee()), StackFrameNativeCode, Strong<ScriptExecutable>(), Strong<UnlinkedCodeBlock>(), 0, 0, 0, 0, 0, String()};
</del><ins>+ StackFrame s = { Strong<JSObject>(vm, visitor->callee()), StackFrameNativeCode, Strong<ScriptExecutable>(), Strong<UnlinkedCodeBlock>(), 0, 0, 0, 0, 0, String(), noSourceID};
</ins><span class="cx"> m_results.append(s);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> unsigned characterOffset;
</span><span class="cx"> unsigned bytecodeOffset;
</span><span class="cx"> String sourceURL;
</span><ins>+ intptr_t sourceID;
</ins><span class="cx"> JS_EXPORT_PRIVATE String toString(CallFrame*);
</span><span class="cx"> String friendlySourceURL() const;
</span><span class="cx"> String friendlyFunctionName(CallFrame*) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "StackVisitor.h"
</span><span class="cx">
</span><span class="cx"> #include "ClonedArguments.h"
</span><ins>+#include "DebuggerPrimitives.h"
</ins><span class="cx"> #include "Executable.h"
</span><span class="cx"> #include "InlineCallFrame.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="lines">@@ -277,6 +278,13 @@
</span><span class="cx"> return traceBuild.toString().impl();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+intptr_t StackVisitor::Frame::sourceID()
+{
+ if (CodeBlock* codeBlock = this->codeBlock())
+ return codeBlock->ownerScriptExecutable()->sourceID();
+ return noSourceID;
+}
+
</ins><span class="cx"> ClonedArguments* StackVisitor::Frame::createArguments()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callFrame);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.h (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.h 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.h 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> JS_EXPORT_PRIVATE String sourceURL();
</span><span class="cx"> JS_EXPORT_PRIVATE String toString();
</span><span class="cx">
</span><ins>+ intptr_t sourceID();
+
</ins><span class="cx"> CodeType codeType() const;
</span><span class="cx"> JS_EXPORT_PRIVATE void computeLineAndColumn(unsigned& line, unsigned& column);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2016-04-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: sourceMappingURL not loaded in generated script
+ https://bugs.webkit.org/show_bug.cgi?id=156022
+ <rdar://problem/25438595>
+
+ Reviewed by Geoffrey Garen.
+
+ * UserInterface/Controllers/SourceMapManager.js:
+ (WebInspector.SourceMapManager.prototype.downloadSourceMap):
+ If the sourceMapURL is a dataURL at this point, we can just pass it on,
+ otherwise we would have returned and skipped it.
+
+ * UserInterface/Models/CallFrame.js:
+ (WebInspector.CallFrame.fromPayload):
+ Add handling for "scriptId" if it is available in the Console.CallFrame.
+ Don't automatically mark CallFrames that didn't have a "url" as native,
+ instead try to get a SourceCode.
+
+ * UserInterface/Models/Script.js:
+ (WebInspector.Script.prototype.get displayURL):
+ Used by SourceCodeLocation formatting, so behave more like Resources
+ when we have only have a sourceURL name. This produces output like:
+ "foo.js:#:#" instead of "foo.js (line #:#)"
+
+ (WebInspector.Script.prototype.get anonymous):
+ Easy accessor to see if this would be treated as anonymous or not.
+
+ * UserInterface/Models/SourceMap.js:
+ (WebInspector.SourceMap.prototype.get sourceMappingBasePathURLComponents):
+ Gracefully handle no path.
+
+ * UserInterface/Models/StackTrace.js:
+ (WebInspector.StackTrace.prototype.get firstNonNativeCallFrame):
+ (WebInspector.StackTrace.prototype.get firstNonNativeNonAnonymousCallFrame):
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendLocationLink):
+ Now that "Eval Code" with a sourceURL is no longer native, we still don't
+ want to show it in the Web Inspector if it is anonymous. So include a stricter
+ version that skips native and anonymous call frames.
+
+2016-04-21 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Debugger statement gets a space after it when pretty printed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156867
</span><span class="cx"> <rdar://problem/25862308>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersSourceMapManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -49,6 +49,11 @@
</span><span class="cx"> if (WebInspector.frameResourceManager.mainFrame)
</span><span class="cx"> baseURL = absoluteURL(WebInspector.frameResourceManager.mainFrame.url, baseURL);
</span><span class="cx">
</span><ins>+ if (sourceMapURL.startsWith("data:")) {
+ this._loadAndParseSourceMap(sourceMapURL, baseURL, originalSourceCode);
+ return;
+ }
+
</ins><span class="cx"> sourceMapURL = absoluteURL(sourceMapURL, baseURL);
</span><span class="cx"> if (!sourceMapURL)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -140,24 +140,31 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(payload);
</span><span class="cx">
</span><del>- let url = payload.url;
</del><ins>+ let {url, scriptId} = payload;
</ins><span class="cx"> let nativeCode = false;
</span><span class="cx"> let sourceCodeLocation = null;
</span><span class="cx"> let functionName = WebInspector.CallFrame.functionNameFromPayload(payload);
</span><span class="cx"> let programCode = WebInspector.CallFrame.programCodeFromPayload(payload);
</span><span class="cx">
</span><del>- if (!url || url === "[native code]") {
</del><ins>+ if (url === "[native code]") {
</ins><span class="cx"> nativeCode = true;
</span><span class="cx"> url = null;
</span><del>- } else {
</del><ins>+ } else if (url || scriptId) {
</ins><span class="cx"> let sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
</span><span class="cx"> if (!sourceCode)
</span><span class="cx"> sourceCode = WebInspector.debuggerManager.scriptsForURL(url)[0];
</span><ins>+ if (!sourceCode && scriptId)
+ sourceCode = WebInspector.debuggerManager.scriptForIdentifier(scriptId);
</ins><span class="cx">
</span><span class="cx"> if (sourceCode) {
</span><span class="cx"> // The lineNumber is 1-based, but we expect 0-based.
</span><span class="cx"> let lineNumber = payload.lineNumber - 1;
</span><span class="cx"> sourceCodeLocation = sourceCode.createLazySourceCodeLocation(lineNumber, payload.columnNumber);
</span><ins>+ } else {
+ // Treat this as native code if we were unable to find a source.
+ console.assert(!url, "We should have detected source code for something with a url");
+ nativeCode = true;
+ url = null;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Script.js (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Script.js 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Script.js 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -107,11 +107,28 @@
</span><span class="cx"> return WebInspector.UIString("Anonymous Script %d").format(this._uniqueDisplayNameNumber);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get displayURL()
+ {
+ const isMultiLine = true;
+ const dataURIMaxSize = 64;
+
+ if (this._url)
+ return WebInspector.truncateURL(this._url, isMultiLine, dataURIMaxSize);
+ if (this._sourceURL)
+ return WebInspector.truncateURL(this._sourceURL, isMultiLine, dataURIMaxSize);
+ return null;
+ }
+
</ins><span class="cx"> get injected()
</span><span class="cx"> {
</span><span class="cx"> return this._injected;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get anonymous()
+ {
+ return !this._resource && !this._url && !this._sourceURL;
+ }
+
</ins><span class="cx"> get resource()
</span><span class="cx"> {
</span><span class="cx"> return this._resource;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> // Fallback for JavaScript debuggable named scripts that may not have a complete URL.
</span><span class="cx"> if (!urlComponents.path)
</span><del>- urlComponents.path = this._sourceMappingURL;
</del><ins>+ urlComponents.path = this._sourceMappingURL || "";
</ins><span class="cx">
</span><span class="cx"> urlComponents.path = urlComponents.path.substr(0, urlComponents.path.lastIndexOf(urlComponents.lastPathComponent));
</span><span class="cx"> urlComponents.lastPathComponent = null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -128,11 +128,28 @@
</span><span class="cx">
</span><span class="cx"> get firstNonNativeCallFrame()
</span><span class="cx"> {
</span><del>- for (var frame of this._callFrames) {
</del><ins>+ for (let frame of this._callFrames) {
</ins><span class="cx"> if (!frame.nativeCode)
</span><span class="cx"> return frame;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><ins>+
+ get firstNonNativeNonAnonymousCallFrame()
+ {
+ for (let frame of this._callFrames) {
+ if (frame.nativeCode)
+ continue;
+ if (frame.sourceCodeLocation) {
+ let sourceCode = frame.sourceCodeLocation.sourceCode;
+ if (sourceCode instanceof WebInspector.Script && sourceCode.anonymous)
+ continue;
+ }
+ return frame;
+ }
+
+ return null;
+ }
+
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (199851 => 199852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-04-22 00:33:32 UTC (rev 199851)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-04-22 00:50:09 UTC (rev 199852)
</span><span class="lines">@@ -314,12 +314,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var firstNonNativeCallFrame = this._message.stackTrace.firstNonNativeCallFrame;
</del><ins>+ var firstNonNativeNonAnonymousCallFrame = this._message.stackTrace.firstNonNativeNonAnonymousCallFrame;
</ins><span class="cx">
</span><span class="cx"> var callFrame;
</span><del>- if (firstNonNativeCallFrame) {
</del><ins>+ if (firstNonNativeNonAnonymousCallFrame) {
</ins><span class="cx"> // JavaScript errors and console.* methods.
</span><del>- callFrame = firstNonNativeCallFrame;
</del><ins>+ callFrame = firstNonNativeNonAnonymousCallFrame;
</ins><span class="cx"> } else if (this._message.url && !this._shouldHideURL(this._message.url)) {
</span><span class="cx"> // CSS warnings have no stack traces.
</span><span class="cx"> callFrame = WebInspector.CallFrame.fromPayload({
</span><span class="lines">@@ -335,7 +335,6 @@
</span><span class="cx"> var locationElement = new WebInspector.CallFrameView(callFrame, showFunctionName);
</span><span class="cx"> locationElement.classList.add("console-message-location");
</span><span class="cx"> this._element.appendChild(locationElement);
</span><del>-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>