<!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>[179713] trunk/Source/WebInspectorUI</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/179713">179713</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2015-02-05 14:47:40 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION: Inline SourceMap resources show empty content when opened.
https://bugs.webkit.org/show_bug.cgi?id=141225
Reviewed by Timothy Hatcher.
Change WebInspector.SourceMapResource.prototype.requestContentFromBackend to correctly and consistently handle
calls to NetworkAgent. The helper function sourceMapResourceLoaded will now properly handle parameters as a single
payload, including manual calls in the case where the source map content is in a data URI. Also
WebInspector.SourceCode.prototype._processContent now properly handles an error string used for displaying
resource loading error messages in the resource content view.
* UserInterface/Models/Resource.js: drive-by style fix.
* UserInterface/Models/SourceCode.js:
(WebInspector.SourceCode.prototype._processContent):
Properly handle error string.
* UserInterface/Models/SourceMapResource.js:
(WebInspector.SourceMapResource.prototype.requestContentFromBackend):
(WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
Formerly sourceMapResourceLoadError, now handles parameters from the NetworkAgent correctly.
(WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoadError):
This function now handles NetworkAgent errors only.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.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="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (179712 => 179713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-05 22:46:30 UTC (rev 179712)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-05 22:47:40 UTC (rev 179713)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-02-04 Jono Wells <jonowells@apple.com>
+
+ Web Inspector: REGRESSION: Inline SourceMap resources show empty content when opened.
+ https://bugs.webkit.org/show_bug.cgi?id=141225
+
+ Reviewed by Timothy Hatcher.
+
+ Change WebInspector.SourceMapResource.prototype.requestContentFromBackend to correctly and consistently handle
+ calls to NetworkAgent. The helper function sourceMapResourceLoaded will now properly handle parameters as a single
+ payload, including manual calls in the case where the source map content is in a data URI. Also
+ WebInspector.SourceCode.prototype._processContent now properly handles an error string used for displaying
+ resource loading error messages in the resource content view.
+
+ * UserInterface/Models/Resource.js: drive-by style fix.
+
+ * UserInterface/Models/SourceCode.js:
+ (WebInspector.SourceCode.prototype._processContent):
+ Properly handle error string.
+
+ * UserInterface/Models/SourceMapResource.js:
+ (WebInspector.SourceMapResource.prototype.requestContentFromBackend):
+ (WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
+ Formerly sourceMapResourceLoadError, now handles parameters from the NetworkAgent correctly.
+
+ (WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoadError):
+ This function now handles NetworkAgent errors only.
+
</ins><span class="cx"> 2015-02-05 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: eliminate some unnecessary layout/painting in timeline overview and ruler
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (179712 => 179713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-02-05 22:46:30 UTC (rev 179712)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-02-05 22:47:40 UTC (rev 179713)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> return WebInspector.SourceCode.prototype.requestContent.call(this);
</span><span class="cx">
</span><span class="cx"> if (this._failed)
</span><del>- return Promise.resolve({ error: WebInspector.UIString("An error occurred trying to load the resource.") });
</del><ins>+ return Promise.resolve({error: WebInspector.UIString("An error occurred trying to load the resource.")});
</ins><span class="cx">
</span><span class="cx"> if (!this._finishThenRequestContentPromise) {
</span><span class="cx"> var listener = new WebInspector.EventListener(this, true);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js (179712 => 179713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-02-05 22:46:30 UTC (rev 179712)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-02-05 22:47:40 UTC (rev 179713)
</span><span class="lines">@@ -191,6 +191,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Different backend APIs return one of `content, `body`, or `scriptSource`.
</span><span class="cx"> var content = parameters.content || parameters.body || parameters.scriptSource;
</span><ins>+ var error = parameters.error;
</ins><span class="cx"> var base64Encoded = parameters.base64Encoded;
</span><span class="cx">
</span><span class="cx"> var revision = this.revisionForRequestedContent;
</span><span class="lines">@@ -201,6 +202,7 @@
</span><span class="cx"> delete this._ignoreRevisionContentDidChangeEvent;
</span><span class="cx">
</span><span class="cx"> return Promise.resolve({
</span><ins>+ error: error,
</ins><span class="cx"> sourceCode: this,
</span><span class="cx"> content: content,
</span><span class="cx"> base64Encoded: base64Encoded
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js (179712 => 179713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2015-02-05 22:46:30 UTC (rev 179712)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2015-02-05 22:47:40 UTC (rev 179713)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.SourceMapResource.prototype = {
</span><span class="cx"> constructor: WebInspector.SourceMapResource,
</span><ins>+ __proto__: WebInspector.Resource.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -84,26 +85,36 @@
</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, null, inlineContent, this.mimeType, 200);
</del><ins>+ return sourceMapResourceLoaded.call(this, {content: inlineContent, mimeType: this.mimeType, status: 200});
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function sourceMapResourceLoadError(error, body, mimeType, statusCode)
</del><ins>+ function sourceMapResourceNotAvailable(error, content, mimeType, statusCode)
</ins><span class="cx"> {
</span><span class="cx"> this.markAsFailed();
</span><span class="cx"> return Promise.resolve({
</span><del>- error: error,
- content: body.content,
</del><ins>+ error: WebInspector.UIString("An error occurred trying to load the resource."),
+ content: content,
</ins><span class="cx"> mimeType: mimeType,
</span><span class="cx"> statusCode: statusCode
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function sourceMapResourceLoaded(body, mimeType, statusCode)
</del><ins>+ function sourceMapResourceLoadError(error)
</ins><span class="cx"> {
</span><ins>+ // There was an error calling NetworkAgent.loadResource.
+ console.error(error || "There was an unknown error calling NetworkAgent.loadResource.");
+ this.markAsFailed();
+ return Promise.resolve({error: WebInspector.UIString("An error occurred trying to load the resource.")});
+ }
+
+ function sourceMapResourceLoaded(parameters)
+ {
+ var {error, content, mimeType, statusCode} = parameters;
+
</ins><span class="cx"> const base64encoded = false;
</span><span class="cx">
</span><del>- if (statusCode >= 400)
- return sourceMapResourceLoadError(error, body, mimeType, statusCode);
</del><ins>+ if (statusCode >= 400 || error)
+ return sourceMapResourceNotAvailable(error, content, mimeType, statusCode);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Add support for picking the best MIME-type. Right now the file extension is the best bet.
</span><span class="cx"> // The constructor set MIME-type based on the file extension and we ignore mimeType here.
</span><span class="lines">@@ -111,17 +122,15 @@
</span><span class="cx"> this.markAsFinished();
</span><span class="cx">
</span><span class="cx"> return Promise.resolve({
</span><del>- content: body.content,
</del><ins>+ content: content,
</ins><span class="cx"> mimeType: mimeType,
</span><span class="cx"> base64encoded: base64encoded,
</span><span class="cx"> statusCode: statusCode
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!NetworkAgent.loadResource) {
- sourceMapResourceLoaded.call(this, "error: no NetworkAgent.loadResource");
- return Promise.reject(new Error("No NetworkAgent.loadResource"));
- }
</del><ins>+ if (!NetworkAgent.loadResource)
+ return sourceMapResourceLoadError.call(this);
</ins><span class="cx">
</span><span class="cx"> var frameIdentifier = null;
</span><span class="cx"> if (this._sourceMap.originalSourceCode instanceof WebInspector.Resource && this._sourceMap.originalSourceCode.parentFrame)
</span><span class="lines">@@ -163,5 +172,3 @@
</span><span class="cx"> return new WebInspector.SourceCodeTextRange(this._sourceMap.originalSourceCode, startSourceCodeLocation, endSourceCodeLocation);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.SourceMapResource.prototype.__proto__ = WebInspector.Resource.prototype;
</del></span></pre>
</div>
</div>
</body>
</html>