<!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>[165583] trunk/Source</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/165583">165583</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-13 18:11:13 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Network.loadResource should include the response status code
https://bugs.webkit.org/show_bug.cgi?id=130216
Reviewed by Timothy Hatcher.
Source/WebCore:
* inspector/InspectorResourceAgent.cpp:
Record and send the http status code.
* inspector/protocol/Network.json:
Include status code property in the success callback.
Source/WebInspectorUI:
* UserInterface/Controllers/SourceMapManager.js:
(WebInspector.SourceMapManager.prototype.sourceMapLoaded):
(WebInspector.SourceMapManager.prototype._loadAndParseSourceMap):
* UserInterface/Models/SourceMapResource.js:
(WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
If the response is 400 or larger, treat it as an error / failed load.
* UserInterface/Protocol/InspectorWebBackendCommands.js:
Update protocol to provide status code parameter.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolNetworkjson">trunk/Source/WebCore/inspector/protocol/Network.json</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="#trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Network.loadResource should include the response status code
+ https://bugs.webkit.org/show_bug.cgi?id=130216
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorResourceAgent.cpp:
+ Record and send the http status code.
+
+ * inspector/protocol/Network.json:
+ Include status code property in the success callback.
+
+2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Network.loadResource XHR crash if page reloaded while request is ongoing
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130211
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> virtual void didReceiveResponse(unsigned long, const ResourceResponse& response) override
</span><span class="cx"> {
</span><span class="cx"> m_mimeType = response.mimeType();
</span><ins>+ m_statusCode = response.httpStatusCode();
</ins><span class="cx">
</span><span class="cx"> // FIXME: This assumes text only responses. We should support non-text responses as well.
</span><span class="cx"> TextEncoding textEncoding(response.textEncodingName());
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> if (m_decoder)
</span><span class="cx"> m_responseText.append(m_decoder->flush());
</span><span class="cx">
</span><del>- m_callback->sendSuccess(m_responseText.toString(), m_mimeType);
</del><ins>+ m_callback->sendSuccess(m_responseText.toString(), m_mimeType, m_statusCode);
</ins><span class="cx"> dispose();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -158,6 +159,7 @@
</span><span class="cx"> RefPtr<TextResourceDecoder> m_decoder;
</span><span class="cx"> String m_mimeType;
</span><span class="cx"> StringBuilder m_responseText;
</span><ins>+ int m_statusCode;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolNetworkjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Network.json (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Network.json 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebCore/inspector/protocol/Network.json 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -200,7 +200,8 @@
</span><span class="cx"> ],
</span><span class="cx"> "returns": [
</span><span class="cx"> { "name": "content", "type": "string", "description": "Resource content." },
</span><del>- { "name": "mimeType", "type": "string", "description": "Resource mimeType." }
</del><ins>+ { "name": "mimeType", "type": "string", "description": "Resource mimeType." },
+ { "name": "status", "type": "number", "description": "HTTP response status code." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Loads a resource in the context of a frame on the inspected page without cross origin checks."
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Network.loadResource should include the response status code
+ https://bugs.webkit.org/show_bug.cgi?id=130216
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/SourceMapManager.js:
+ (WebInspector.SourceMapManager.prototype.sourceMapLoaded):
+ (WebInspector.SourceMapManager.prototype._loadAndParseSourceMap):
+ * UserInterface/Models/SourceMapResource.js:
+ (WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
+ If the response is 400 or larger, treat it as an error / failed load.
+
+ * UserInterface/Protocol/InspectorWebBackendCommands.js:
+ Update protocol to provide status code parameter.
+
</ins><span class="cx"> 2014-03-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused callId parameter from evaluateInWebInspector
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersSourceMapManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> {
</span><span class="cx"> this._downloadingSourceMaps[sourceMapURL] = true;
</span><span class="cx">
</span><del>- function sourceMapLoaded(error, content, mimeType)
</del><ins>+ function sourceMapLoaded(error, content, mimeType, statusCode)
</ins><span class="cx"> {
</span><del>- if (error) {
</del><ins>+ if (error || statusCode >= 400) {
</ins><span class="cx"> this._loadAndParseFailed(sourceMapURL);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -79,11 +79,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function sourceMapResourceLoaded(error, body, mimeType)
</del><ins>+ function sourceMapResourceLoaded(error, body, mimeType, statusCode)
</ins><span class="cx"> {
</span><span class="cx"> const base64encoded = false;
</span><span class="cx">
</span><del>- if (error) {
</del><ins>+ if (error || statusCode >= 400) {
</ins><span class="cx"> this.markAsFailed();
</span><span class="cx"> callback(error, body, base64encoded);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js (165582 => 165583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js 2014-03-14 01:11:11 UTC (rev 165582)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js 2014-03-14 01:11:13 UTC (rev 165583)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> InspectorBackend.registerCommand("Network.canClearBrowserCookies", [], ["result"]);
</span><span class="cx"> InspectorBackend.registerCommand("Network.clearBrowserCookies", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Network.setCacheDisabled", [{"name": "cacheDisabled", "type": "boolean", "optional": false}], []);
</span><del>-InspectorBackend.registerCommand("Network.loadResource", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], ["content", "mimeType"]);
</del><ins>+InspectorBackend.registerCommand("Network.loadResource", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], ["content", "mimeType", "status"]);
</ins><span class="cx">
</span><span class="cx"> // Page.
</span><span class="cx"> InspectorBackend.registerPageDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Page");
</span></span></pre>
</div>
</div>
</body>
</html>