<!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>[199689] 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/199689">199689</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-18 14:53:02 -0700 (Mon, 18 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed revert accidental ChangeLog modifications.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199688 => 199689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-18 21:50:24 UTC (rev 199688)
+++ trunk/LayoutTests/ChangeLog 2016-04-18 21:53:02 UTC (rev 199689)
</span><span class="lines">@@ -1,23 +1,3 @@
</span><del>-2016-04-18 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: sourceMappingURL not used when sourceURL is set
- https://bugs.webkit.org/show_bug.cgi?id=156021
- <rdar://problem/25438417>
-
- Reviewed by Timothy Hatcher.
-
- * inspector/debugger/scriptParsed.html:
- * inspector/debugger/search-scripts.html:
- * inspector/debugger/setBreakpointByUrl-sourceURL.html:
- * inspector/debugger/sourceURLs.html:
- Update tests that need to handle sourceURL separately.
-
- * inspector/model/resources/relationship-named.js: Added.
- * inspector/model/resources/relationship-normal.js: Added.
- * inspector/model/script-resource-relationship-expected.txt: Added.
- * inspector/model/script-resource-relationship.html: Added.
- Tests for Script and Resource relationships.
-
</del><span class="cx"> 2016-04-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Remove stubs for dynamically-added favicons (via link rel="icon")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199688 => 199689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-18 21:50:24 UTC (rev 199688)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-18 21:53:02 UTC (rev 199689)
</span><span class="lines">@@ -1,27 +1,3 @@
</span><del>-2016-04-18 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: sourceMappingURL not used when sourceURL is set
- https://bugs.webkit.org/show_bug.cgi?id=156021
- <rdar://problem/25438417>
-
- Reviewed by Timothy Hatcher.
-
- Clean up Debugger.sourceParsed to separately include:
-
- - url ("resource URL", "source url" in JSC APIs)
- - sourceURL - //# sourceURL directive
-
- By always having the resource URL the Web Inspector frontend
- can better match this Script to a Resource of the same URL,
- and decide to use the sourceURL if it is available when
- appropriate.
-
- * inspector/protocol/Debugger.json:
- * inspector/agents/InspectorDebuggerAgent.cpp:
- (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
- (Inspector::InspectorDebuggerAgent::didParseSource):
- Send the new sourceParsed parameters.
-
</del><span class="cx"> 2016-04-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> ToThis should have a fast path based on type info flags
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199688 => 199689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-18 21:50:24 UTC (rev 199688)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-18 21:53:02 UTC (rev 199689)
</span><span class="lines">@@ -1,68 +1,3 @@
</span><del>-2016-04-18 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: sourceMappingURL not used when sourceURL is set
- https://bugs.webkit.org/show_bug.cgi?id=156021
- <rdar://problem/25438417>
-
- Reviewed by Timothy Hatcher.
-
- Previously Debugger.sourceParsed only providing the sourceURL, and
- wiping out the resourceURL, meant that a Script from a Resource that
- set a sourceURL directive would fail to be associated with its Resource.
-
- This would result in duplicated tree elements in the Resources Sidebar,
- one for the Resource, and one for the Script. With the Script getting
- ultimately getting the SourceMap resources. However, since the frontend
- prefers Resources over Scripts when possible, an error that generated
- from the script would point to a location in the Resource, not following
- source maps.
-
- By always providing the resource URL in Debugger.sourceParsed, a Script
- can better be associated with its Resource. The result is now a single
- shared tree element in the Resources Sidebar, and the Resource getting
- the SourceMap resources. Now the script error goes through the Resource
- to its SourceMap resources as we would expect.
-
- * UserInterface/Protocol/DebuggerObserver.js:
- (WebInspector.DebuggerObserver):
- (WebInspector.DebuggerObserver.prototype.scriptParsed):
- We now have to handle two different signatures of scriptParsed. One
- for legacy, and one for non-legacy. Cache that value early on, since
- scriptParsed happens a lot.
-
- * UserInterface/Protocol/InspectorBackend.js:
- (InspectorBackend.Agent.prototype.hasEventParameter):
- Runtime check a protocol event to see if it has a parameter. This
- is used to check if Debugger.sourceParsed is legacy or not based
- on if it has the legacy "hasSourceURL" parameter.
-
- * UserInterface/Models/Script.js:
- (WebInspector.Script):
- (WebInspector.Script.prototype.get sourceURL):
- Treat sourceURL and url separately.
-
- (WebInspector.Script.prototype.get displayName):
- Handle both the url and sourceURL in displayName.
-
- * UserInterface/Controllers/DebuggerManager.js:
- (WebInspector.DebuggerManager.prototype.get knownNonResourceScripts):
- (WebInspector.DebuggerManager.prototype.debuggerDidPause):
- (WebInspector.DebuggerManager.prototype.scriptDidParse):
- * UserInterface/Protocol/RemoteObject.js:
- (WebInspector.RemoteObject.prototype.findFunctionSourceCodeLocation):
- Update code that checks the sourceURL to explicitly use sourceURL.
-
- * UserInterface/Controllers/SourceMapManager.js:
- (WebInspector.SourceMapManager.prototype.downloadSourceMap):
- For legacy backends, or in case we get a resource that has an incomplete
- baseURL, attempt to get an absolute URL based on the main resource.
-
- * UserInterface/Views/DebuggerSidebarPanel.js:
- (WebInspector.DebuggerSidebarPanel.prototype._addScript):
- * UserInterface/Views/ResourceSidebarPanel.js:
- (WebInspector.ResourceSidebarPanel.prototype._scriptWasAdded):
- Ignore scripts without a url or sourceURL.
-
</del><span class="cx"> 2016-04-18 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: NavigationSidebarPanel does a lot of style recalc and layout on busy sites
</span></span></pre>
</div>
</div>
</body>
</html>