<!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>[194981] 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/194981">194981</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-13 13:32:44 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Inspector should use the last sourceURL / sourceMappingURL directive
https://bugs.webkit.org/show_bug.cgi?id=153072
<rdar://problem/24168312>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-01-13
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* parser/Lexer.cpp:
(JSC::Lexer<T>::parseCommentDirective):
Just keep overwriting the member variable so we end up with
the last directive value.
Source/WebInspectorUI:
* UserInterface/Base/Utilities.js:
Prepend instead of append the sourceURL so the provided string
can include a sourceURL and override it. Such as manually
evaluating a script through the quick console with a sourceURL.
* UserInterface/Models/SourceMapResource.js:
Fix an incorrectly named property.
LayoutTests:
* inspector/console/console-api-expected.txt:
* inspector/console/console-table-expected.txt:
* platform/mac/inspector/model/remote-object-expected.txt:
Updated line number in output now that code evaluated through the frontend
gets the __WebInspectorInternal__ sourceURL prepended to the start instead
of appended to the end.
* inspector/debugger/sourceURLs-expected.txt:
* inspector/debugger/sourceURLs.html:
Update the test to find the second sourceURL, not the first.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt">trunk/LayoutTests/inspector/console/console-api-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoletableexpectedtxt">trunk/LayoutTests/inspector/console/console-table-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersourceURLsexpectedtxt">trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersourceURLshtml">trunk/LayoutTests/inspector/debugger/sourceURLs.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/LayoutTests/ChangeLog 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Inspector should use the last sourceURL / sourceMappingURL directive
+ https://bugs.webkit.org/show_bug.cgi?id=153072
+ <rdar://problem/24168312>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/console/console-api-expected.txt:
+ * inspector/console/console-table-expected.txt:
+ * platform/mac/inspector/model/remote-object-expected.txt:
+ Updated line number in output now that code evaluated through the frontend
+ gets the __WebInspectorInternal__ sourceURL prepended to the start instead
+ of appended to the end.
+
+ * inspector/debugger/sourceURLs-expected.txt:
+ * inspector/debugger/sourceURLs.html:
+ Update the test to find the second sourceURL, not the first.
+
</ins><span class="cx"> 2016-01-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [XSS Auditor] Do not include trailing comment characters in JavaScript snippets
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-api-expected.txt (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-api-expected.txt 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/LayoutTests/inspector/console/console-api-expected.txt 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><del>-CONSOLE MESSAGE: line 1: console.log
-CONSOLE MESSAGE: line 1: console.warn
-CONSOLE MESSAGE: line 1: console.error
-CONSOLE MESSAGE: line 1: console.debug
-CONSOLE MESSAGE: line 1: console.info
-CONSOLE MESSAGE: line 1: assertion message
-CONSOLE MESSAGE: line 1: string message
-CONSOLE MESSAGE: line 1: message
-CONSOLE MESSAGE: line 1: message
-CONSOLE MESSAGE: line 1: message
-CONSOLE MESSAGE: line 1: message
-CONSOLE MESSAGE: line 1: message
-CONSOLE MESSAGE: line 1: [object Object]
-CONSOLE MESSAGE: line 1: [object Object]
-CONSOLE MESSAGE: line 1: groupName
</del><ins>+CONSOLE MESSAGE: line 3: console.log
+CONSOLE MESSAGE: line 3: console.warn
+CONSOLE MESSAGE: line 3: console.error
+CONSOLE MESSAGE: line 3: console.debug
+CONSOLE MESSAGE: line 3: console.info
+CONSOLE MESSAGE: line 3: assertion message
+CONSOLE MESSAGE: line 3: string message
+CONSOLE MESSAGE: line 3: message
+CONSOLE MESSAGE: line 3: message
+CONSOLE MESSAGE: line 3: message
+CONSOLE MESSAGE: line 3: message
+CONSOLE MESSAGE: line 3: message
+CONSOLE MESSAGE: line 3: [object Object]
+CONSOLE MESSAGE: line 3: [object Object]
+CONSOLE MESSAGE: line 3: groupName
</ins><span class="cx"> CONSOLE MESSAGE: groupName
</span><del>-CONSOLE MESSAGE: line 1: collapsedGroupName
</del><ins>+CONSOLE MESSAGE: line 3: collapsedGroupName
</ins><span class="cx"> CONSOLE MESSAGE: collapsedGroupName
</span><span class="cx">
</span><span class="cx"> STEP: console.log('console.log')
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> "_messageText": "console.log",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 12,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> "_messageText": "console.warn",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 13,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> "_messageText": "console.error",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> "_messageText": "console.debug",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> "_messageText": "console.info",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 13,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> "_messageText": "assertion message",
</span><span class="cx"> "_type": "assert",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 15,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> "_messageText": "",
</span><span class="cx"> "_type": "trace",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> "_messageText": "string message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 12,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> "_messageText": "message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 12,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> "_messageText": "message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> "_messageText": "message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 13,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> "_messageText": "message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> "_messageText": "message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 13,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> "_messageText": "[object Object]",
</span><span class="cx"> "_type": "dir",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 12,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> "_messageText": "[object Object]",
</span><span class="cx"> "_type": "dirxml",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 15,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> "_messageText": "groupName",
</span><span class="cx"> "_type": "startGroup",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> "_messageText": "collapsedGroupName",
</span><span class="cx"> "_type": "startGroupCollapsed",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 23,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -588,7 +588,7 @@
</span><span class="cx"> "_messageText": "<no label>: 1",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> "_messageText": "<no label>: 2",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx"> "_messageText": "<no label>: 3",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> "_messageText": " : 1",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> "_messageText": "<no label>: 4",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> "_messageText": " : 2",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> "_messageText": "string: 1",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> "_messageText": "string: 2",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> "_messageText": "[object Object]: 1",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> "_messageText": "[object Object]: 2",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx"> "_messageText": "[object Object]: 3",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> "_messageText": "[object Object]: 4",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -756,7 +756,7 @@
</span><span class="cx"> "_messageText": "42: 1",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span><span class="lines">@@ -770,7 +770,7 @@
</span><span class="cx"> "_messageText": "42: 2",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_stackTrace": "<filtered>",
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoletableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-table-expected.txt (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-table-expected.txt 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/LayoutTests/inspector/console/console-table-expected.txt 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-CONSOLE MESSAGE: line 1:
-CONSOLE MESSAGE: line 1: apple,orange,banana
-CONSOLE MESSAGE: line 1: [object Object]
-CONSOLE MESSAGE: line 1: John,Smith,Jane,Doe,Emily,Jones
-CONSOLE MESSAGE: line 1: [object Object],[object Object],[object Object]
-CONSOLE MESSAGE: line 1: [object Object],[object Object],[object Object]
</del><ins>+CONSOLE MESSAGE: line 3:
+CONSOLE MESSAGE: line 3: apple,orange,banana
+CONSOLE MESSAGE: line 3: [object Object]
+CONSOLE MESSAGE: line 3: John,Smith,Jane,Doe,Emily,Jones
+CONSOLE MESSAGE: line 3: [object Object],[object Object],[object Object]
+CONSOLE MESSAGE: line 3: [object Object],[object Object],[object Object]
</ins><span class="cx">
</span><span class="cx"> STEP: console.table([])
</span><span class="cx"> {
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> "_messageText": "",
</span><span class="cx"> "_type": "table",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> "_messageText": "apple,orange,banana",
</span><span class="cx"> "_type": "table",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> "_messageText": "[object Object]",
</span><span class="cx"> "_type": "table",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> "_messageText": "John,Smith,Jane,Doe,Emily,Jones",
</span><span class="cx"> "_type": "table",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> "_messageText": "[object Object],[object Object],[object Object]",
</span><span class="cx"> "_type": "table",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> "_messageText": "[object Object],[object Object],[object Object]",
</span><span class="cx"> "_type": "table",
</span><span class="cx"> "_url": null,
</span><del>- "_line": 1,
</del><ins>+ "_line": 3,
</ins><span class="cx"> "_column": 14,
</span><span class="cx"> "_repeatCount": 1,
</span><span class="cx"> "_parameters": [
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersourceURLsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> Found Script with sourceURL 'test6.js'
</span><span class="cx"> Found Script with sourceURL 'test7.js'
</span><span class="cx"> Found Script with sourceURL 'test8.js'
</span><del>-Found Script with sourceURL 'test9.js'
</del><ins>+Found Script with sourceURL 'second.js'
</ins><span class="cx">
</span><span class="cx"> -- Running test case: TestExpressionsForSourceMappingURL
</span><span class="cx"> Found Script with sourceMappingURL 'test1.js'
</span><span class="lines">@@ -22,5 +22,5 @@
</span><span class="cx"> Found Script with sourceMappingURL 'test6.js'
</span><span class="cx"> Found Script with sourceMappingURL 'test7.js'
</span><span class="cx"> Found Script with sourceMappingURL 'test8.js'
</span><del>-Found Script with sourceMappingURL 'test9.js'
</del><ins>+Found Script with sourceMappingURL 'second.js'
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersourceURLshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/sourceURLs.html (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/sourceURLs.html 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/LayoutTests/inspector/debugger/sourceURLs.html 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -191,9 +191,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> addValidTestCase({
</span><del>- description: "Multiple SourceURLs will return the first.",
- expression: "eval('//# sourceURL=test9.js\\n//# sourceURL=second.js')",
- expected: "test9.js",
</del><ins>+ description: "Multiple SourceURLs will return the second.",
+ expression: "eval('//# sourceURL=first.js\\n//# sourceURL=second.js')",
+ expected: "second.js",
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> InspectorProtocol.sendCommand("Debugger.enable", {});
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -2099,7 +2099,7 @@
</span><span class="cx"> {
</span><span class="cx"> "_name": "line",
</span><span class="cx"> "_type": "number",
</span><del>- "_value": "1"
</del><ins>+ "_value": "3"
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "_name": "column",
</span><span class="lines">@@ -2138,7 +2138,7 @@
</span><span class="cx"> {
</span><span class="cx"> "_name": "line",
</span><span class="cx"> "_type": "number",
</span><del>- "_value": "1"
</del><ins>+ "_value": "3"
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "_name": "column",
</span><span class="lines">@@ -2187,7 +2187,7 @@
</span><span class="cx"> {
</span><span class="cx"> "_name": "line",
</span><span class="cx"> "_type": "number",
</span><del>- "_value": "1"
</del><ins>+ "_value": "3"
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "_name": "column",
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Inspector should use the last sourceURL / sourceMappingURL directive
+ https://bugs.webkit.org/show_bug.cgi?id=153072
+ <rdar://problem/24168312>
+
+ Reviewed by Timothy Hatcher.
+
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::parseCommentDirective):
+ Just keep overwriting the member variable so we end up with
+ the last directive value.
+
</ins><span class="cx"> 2016-01-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r194969.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1713,15 +1713,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (consume("URL=")) {
</span><del>- if (!m_sourceURLDirective.isEmpty())
- return;
</del><span class="cx"> m_sourceURLDirective = parseCommentDirectiveValue();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (consume("MappingURL=")) {
</span><del>- if (!m_sourceMappingURLDirective.isEmpty())
- return;
</del><span class="cx"> m_sourceMappingURLDirective = parseCommentDirectiveValue();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Inspector should use the last sourceURL / sourceMappingURL directive
+ https://bugs.webkit.org/show_bug.cgi?id=153072
+ <rdar://problem/24168312>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Utilities.js:
+ Prepend instead of append the sourceURL so the provided string
+ can include a sourceURL and override it. Such as manually
+ evaluating a script through the quick console with a sourceURL.
+
+ * UserInterface/Models/SourceMapResource.js:
+ Fix an incorrectly named property.
+
</ins><span class="cx"> 2016-01-13 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add support for the existing GradientEditor in the CSS Rules sidebar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx">
</span><span class="cx"> function appendWebInspectorSourceURL(string)
</span><span class="cx"> {
</span><del>- return string + "\n//# sourceURL=__WebInspectorInternal__\n";
</del><ins>+ return "\n//# sourceURL=__WebInspectorInternal__\n" + string;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function isWebInspectorInternalScript(url)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js (194980 => 194981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2016-01-13 21:24:11 UTC (rev 194980)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2016-01-13 21:32:44 UTC (rev 194981)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> // Force inline content to be asynchronous to match the expected load pattern.
</span><span class="cx"> // FIXME: We don't know the MIME-type for inline content. Guess by analyzing the content?
</span><span class="cx"> // Returns a promise.
</span><del>- return sourceMapResourceLoaded.call(this, {content: inlineContent, mimeType: this.mimeType, status: 200});
</del><ins>+ return sourceMapResourceLoaded.call(this, {content: inlineContent, mimeType: this.mimeType, statusCode: 200});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sourceMapResourceNotAvailable(error, content, mimeType, statusCode)
</span></span></pre>
</div>
</div>
</body>
</html>