Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1559)

Unified Diff: Source/devtools/front_end/sdk/NetworkManager.js

Issue 667743002: DevTools: remove "type" getters in Resource and NetworkRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/sdk/NetworkManager.js
diff --git a/Source/devtools/front_end/sdk/NetworkManager.js b/Source/devtools/front_end/sdk/NetworkManager.js
index 1804291e050c19c8ccf1398372df3e373a1dcbee..2a26bafee034ec248695bb09017a36610f59a017 100644
--- a/Source/devtools/front_end/sdk/NetworkManager.js
+++ b/Source/devtools/front_end/sdk/NetworkManager.js
@@ -214,7 +214,7 @@ WebInspector.NetworkDispatcher.prototype = {
var consoleModel = this._manager._target.consoleModel;
consoleModel.addMessage(new WebInspector.ConsoleMessage(consoleModel.target(), WebInspector.ConsoleMessage.MessageSource.Network,
WebInspector.ConsoleMessage.MessageLevel.Log,
- WebInspector.UIString("Resource interpreted as %s but transferred with MIME type %s: \"%s\".", networkRequest.type.title(), networkRequest.mimeType, networkRequest.url),
+ WebInspector.UIString("Resource interpreted as %s but transferred with MIME type %s: \"%s\".", networkRequest.resourceType().title(), networkRequest.mimeType, networkRequest.url),
WebInspector.ConsoleMessage.MessageType.Log,
"",
0,
@@ -238,18 +238,19 @@ WebInspector.NetworkDispatcher.prototype = {
if (networkRequest.hasErrorStatusCode() || networkRequest.statusCode === 304 || networkRequest.statusCode === 204)
return true;
- if (typeof networkRequest.type === "undefined"
- || networkRequest.type === WebInspector.resourceTypes.Other
- || networkRequest.type === WebInspector.resourceTypes.Media
- || networkRequest.type === WebInspector.resourceTypes.XHR
- || networkRequest.type === WebInspector.resourceTypes.WebSocket)
+ var resourceType = networkRequest.resourceType();
+ if (resourceType === undefined
+ || resourceType === WebInspector.resourceTypes.Other
+ || resourceType === WebInspector.resourceTypes.Media
+ || resourceType === WebInspector.resourceTypes.XHR
+ || resourceType === WebInspector.resourceTypes.WebSocket)
return true;
if (!networkRequest.mimeType)
return true; // Might be not known for cached resources with null responses.
if (networkRequest.mimeType in WebInspector.NetworkManager._MIMETypes)
- return networkRequest.type.name() in WebInspector.NetworkManager._MIMETypes[networkRequest.mimeType];
+ return resourceType.name() in WebInspector.NetworkManager._MIMETypes[networkRequest.mimeType];
return false;
},
@@ -318,7 +319,7 @@ WebInspector.NetworkDispatcher.prototype = {
}
networkRequest.responseReceivedTime = time;
- networkRequest.type = WebInspector.resourceTypes[resourceType];
+ networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]);
this._updateNetworkRequestWithResponse(networkRequest, response);
@@ -372,7 +373,7 @@ WebInspector.NetworkDispatcher.prototype = {
return;
networkRequest.failed = true;
- networkRequest.type = WebInspector.resourceTypes[resourceType];
+ networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]);
networkRequest.canceled = canceled;
networkRequest.localizedFailDescription = localizedDescription;
this._finishNetworkRequest(networkRequest, time, -1);
@@ -386,7 +387,7 @@ WebInspector.NetworkDispatcher.prototype = {
{
// FIXME: WebSocket MUST have initiator info.
var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, requestURL, "", "", "", null);
- networkRequest.type = WebInspector.resourceTypes.WebSocket;
+ networkRequest.setResourceType(WebInspector.resourceTypes.WebSocket);
this._startNetworkRequest(networkRequest);
},
« no previous file with comments | « Source/devtools/front_end/resources/ResourcesPanel.js ('k') | Source/devtools/front_end/sdk/NetworkRequest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698