Index: third_party/WebKit/Source/devtools/front_end/host/ResourceLoader.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/host/ResourceLoader.js b/third_party/WebKit/Source/devtools/front_end/host/ResourceLoader.js |
index 9d7341ed675f12c272da6b2701792c51f1cc8b2b..309263f92e7d91c73dfaf1ca405de16288b88e8f 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/host/ResourceLoader.js |
+++ b/third_party/WebKit/Source/devtools/front_end/host/ResourceLoader.js |
@@ -1,7 +1,6 @@ |
// Copyright (c) 2015 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
- |
WebInspector.ResourceLoader = {}; |
WebInspector.ResourceLoader._lastStreamId = 0; |
@@ -12,28 +11,25 @@ WebInspector.ResourceLoader._boundStreams = {}; |
* @param {!WebInspector.OutputStream} stream |
* @return {number} |
*/ |
-WebInspector.ResourceLoader._bindOutputStream = function(stream) |
-{ |
- WebInspector.ResourceLoader._boundStreams[++WebInspector.ResourceLoader._lastStreamId] = stream; |
- return WebInspector.ResourceLoader._lastStreamId; |
+WebInspector.ResourceLoader._bindOutputStream = function(stream) { |
+ WebInspector.ResourceLoader._boundStreams[++WebInspector.ResourceLoader._lastStreamId] = stream; |
+ return WebInspector.ResourceLoader._lastStreamId; |
}; |
/** |
* @param {number} id |
*/ |
-WebInspector.ResourceLoader._discardOutputStream = function(id) |
-{ |
- WebInspector.ResourceLoader._boundStreams[id].close(); |
- delete WebInspector.ResourceLoader._boundStreams[id]; |
+WebInspector.ResourceLoader._discardOutputStream = function(id) { |
+ WebInspector.ResourceLoader._boundStreams[id].close(); |
+ delete WebInspector.ResourceLoader._boundStreams[id]; |
}; |
/** |
* @param {number} id |
* @param {string} chunk |
*/ |
-WebInspector.ResourceLoader.streamWrite = function(id, chunk) |
-{ |
- WebInspector.ResourceLoader._boundStreams[id].write(chunk); |
+WebInspector.ResourceLoader.streamWrite = function(id, chunk) { |
+ WebInspector.ResourceLoader._boundStreams[id].write(chunk); |
}; |
/** |
@@ -41,19 +37,17 @@ WebInspector.ResourceLoader.streamWrite = function(id, chunk) |
* @param {?Object.<string, string>} headers |
* @param {function(number, !Object.<string, string>, string)} callback |
*/ |
-WebInspector.ResourceLoader.load = function(url, headers, callback) |
-{ |
- var stream = new WebInspector.StringOutputStream(); |
- WebInspector.ResourceLoader.loadAsStream(url, headers, stream, mycallback); |
+WebInspector.ResourceLoader.load = function(url, headers, callback) { |
+ var stream = new WebInspector.StringOutputStream(); |
+ WebInspector.ResourceLoader.loadAsStream(url, headers, stream, mycallback); |
- /** |
- * @param {number} statusCode |
- * @param {!Object.<string, string>} headers |
- */ |
- function mycallback(statusCode, headers) |
- { |
- callback(statusCode, headers, stream.data()); |
- } |
+ /** |
+ * @param {number} statusCode |
+ * @param {!Object.<string, string>} headers |
+ */ |
+ function mycallback(statusCode, headers) { |
+ callback(statusCode, headers, stream.data()); |
+ } |
}; |
/** |
@@ -62,45 +56,39 @@ WebInspector.ResourceLoader.load = function(url, headers, callback) |
* @param {!WebInspector.OutputStream} stream |
* @param {function(number, !Object.<string, string>)=} callback |
*/ |
-WebInspector.ResourceLoader.loadAsStream = function(url, headers, stream, callback) |
-{ |
- var streamId = WebInspector.ResourceLoader._bindOutputStream(stream); |
- var parsedURL = new WebInspector.ParsedURL(url); |
- if (parsedURL.isDataURL()) { |
- loadXHR(url) |
- .then(dataURLDecodeSuccessful) |
- .catch(dataURLDecodeFailed); |
- return; |
- } |
+WebInspector.ResourceLoader.loadAsStream = function(url, headers, stream, callback) { |
+ var streamId = WebInspector.ResourceLoader._bindOutputStream(stream); |
+ var parsedURL = new WebInspector.ParsedURL(url); |
+ if (parsedURL.isDataURL()) { |
+ loadXHR(url).then(dataURLDecodeSuccessful).catch(dataURLDecodeFailed); |
+ return; |
+ } |
- var rawHeaders = []; |
- if (headers) { |
- for (var key in headers) |
- rawHeaders.push(key + ": " + headers[key]); |
- } |
- InspectorFrontendHost.loadNetworkResource(url, rawHeaders.join("\r\n"), streamId, finishedCallback); |
+ var rawHeaders = []; |
+ if (headers) { |
+ for (var key in headers) |
+ rawHeaders.push(key + ': ' + headers[key]); |
+ } |
+ InspectorFrontendHost.loadNetworkResource(url, rawHeaders.join('\r\n'), streamId, finishedCallback); |
- /** |
- * @param {!InspectorFrontendHostAPI.LoadNetworkResourceResult} response |
- */ |
- function finishedCallback(response) |
- { |
- if (callback) |
- callback(response.statusCode, response.headers || {}); |
- WebInspector.ResourceLoader._discardOutputStream(streamId); |
- } |
+ /** |
+ * @param {!InspectorFrontendHostAPI.LoadNetworkResourceResult} response |
+ */ |
+ function finishedCallback(response) { |
+ if (callback) |
+ callback(response.statusCode, response.headers || {}); |
+ WebInspector.ResourceLoader._discardOutputStream(streamId); |
+ } |
- /** |
- * @param {string} text |
- */ |
- function dataURLDecodeSuccessful(text) |
- { |
- WebInspector.ResourceLoader.streamWrite(streamId, text); |
- finishedCallback(/** @type {!InspectorFrontendHostAPI.LoadNetworkResourceResult} */ ({statusCode : 200})); |
- } |
+ /** |
+ * @param {string} text |
+ */ |
+ function dataURLDecodeSuccessful(text) { |
+ WebInspector.ResourceLoader.streamWrite(streamId, text); |
+ finishedCallback(/** @type {!InspectorFrontendHostAPI.LoadNetworkResourceResult} */ ({statusCode: 200})); |
+ } |
- function dataURLDecodeFailed() |
- { |
- finishedCallback(/** @type {!InspectorFrontendHostAPI.LoadNetworkResourceResult} */ ({statusCode : 404})); |
- } |
+ function dataURLDecodeFailed() { |
+ finishedCallback(/** @type {!InspectorFrontendHostAPI.LoadNetworkResourceResult} */ ({statusCode: 404})); |
+ } |
}; |