Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js |
index 4cc22fa082fb158f7591fb58d1185d28542aa80f..6ebaa6c49952ea7aec9aea642567fdb9fdf189c1 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js |
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js |
@@ -61,7 +61,7 @@ SDK.NetworkRequest = class extends Common.Object { |
this.statusCode = 0; |
this.statusText = ''; |
this.requestMethod = ''; |
- this.requestTime = 0; |
+ //this.requestTime = 0; |
this.protocol = ''; |
/** @type {!Protocol.Network.RequestMixedContentType} */ |
this.mixedContentType = Protocol.Network.RequestMixedContentType.None; |
@@ -96,6 +96,18 @@ SDK.NetworkRequest = class extends Common.Object { |
this.connectionId = '0'; |
} |
+ /** |
+ * @param {string} mimeType |
+ * @return {!Common.ResourceType} |
+ */ |
+ static resourceTypeForMimeType(mimeType) { |
+ if (mimeType.startsWith('image')) |
+ return Common.resourceTypes.Image; |
+ if (mimeType.includes('font')) |
+ return Common.resourceTypes.Font; |
+ return Common.resourceTypes.Other; |
+ } |
+ |
/** |
* @param {!SDK.NetworkRequest} other |
* @return {number} |
@@ -531,8 +543,9 @@ SDK.NetworkRequest = class extends Common.Object { |
} else { |
this._path = this._parsedURL.host + this._parsedURL.folderPathComponents; |
- var networkManager = SDK.NetworkManager.managerForRequest(this); |
- var inspectedURL = networkManager ? networkManager.target().inspectedURL().asParsedURL() : null; |
+ |
+ var pageLoad = NetworkLog.networkLog.pageLoadForRequest(this); |
+ var inspectedURL = pageLoad ? pageLoad.inspectedURL : null; |
this._path = this._path.trimURL(inspectedURL ? inspectedURL.host : ''); |
if (this._parsedURL.lastPathComponent || this._parsedURL.queryParams) { |
this._name = |
@@ -674,7 +687,7 @@ SDK.NetworkRequest = class extends Common.Object { |
requestHttpVersion() { |
var headersText = this.requestHeadersText(); |
if (!headersText) |
- return this.requestHeaderValue('version') || this.requestHeaderValue(':version') || 'unknown'; |
+ return this.requestHeaderValue('version') || this.requestHeaderValue(':version') || this.protocol || 'unknown'; |
var firstLine = headersText.split(/\r\n/)[0]; |
var match = firstLine.match(/(HTTP\/\d+\.\d+)$/); |
return match ? match[1] : 'HTTP/0.9'; |
@@ -822,7 +835,7 @@ SDK.NetworkRequest = class extends Common.Object { |
responseHttpVersion() { |
var headersText = this._responseHeadersText; |
if (!headersText) |
- return this.responseHeaderValue('version') || this.responseHeaderValue(':version') || 'unknown'; |
+ return this.responseHeaderValue('version') || this.responseHeaderValue(':version') || this.protocol || 'unknown'; |
var firstLine = headersText.split(/\r\n/)[0]; |
var match = firstLine.match(/^(HTTP\/\d+\.\d+)/); |
return match ? match[1] : 'HTTP/0.9'; |