Commit e0695666 authored by caseq@chromium.org's avatar caseq@chromium.org

DevTools: expose initial request priority in the Network panel UI

BUG=522739

Review URL: https://codereview.chromium.org/1323143005

git-svn-id: svn://svn.chromium.org/blink/trunk@201673 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 72dd6d19
......@@ -106,6 +106,7 @@ WebInspector.NetworkDataGridNode.prototype = {
case "remoteAddress": cell.setTextAndTitle(this._request.remoteAddress()); break;
case "cookies": cell.setTextAndTitle(this._arrayLength(this._request.requestCookies)); break;
case "setCookies": cell.setTextAndTitle(this._arrayLength(this._request.responseCookies)); break;
case "priority": cell.setTextAndTitle(this._uiLabelForPriority(this._request.initialPriority())); break;
case "connectionId": cell.setTextAndTitle(this._request.connectionId); break;
case "type": this._renderTypeCell(cell); break;
case "initiator": this._renderInitiatorCell(cell); break;
......@@ -531,6 +532,24 @@ WebInspector.NetworkDataGridNode.prototype = {
}
},
/**
* @param {?NetworkAgent.ResourcePriority} priority
*/
_uiLabelForPriority: function(priority)
{
var labelMap = WebInspector.NetworkDataGridNode._priorityToUILabel;
if (!labelMap) {
WebInspector.NetworkDataGridNode._priorityToUILabel = new Map();
labelMap = WebInspector.NetworkDataGridNode._priorityToUILabel;
labelMap.set(NetworkAgent.ResourcePriority.VeryLow, WebInspector.UIString("Lowest"));
labelMap.set(NetworkAgent.ResourcePriority.Low, WebInspector.UIString("Low"));
labelMap.set(NetworkAgent.ResourcePriority.Medium, WebInspector.UIString("Medium"));
labelMap.set(NetworkAgent.ResourcePriority.High, WebInspector.UIString("High"));
labelMap.set(NetworkAgent.ResourcePriority.VeryHigh, WebInspector.UIString("Highest"));
}
return priority ? labelMap.get(priority) : WebInspector.UIString("Unknown");
},
__proto__: WebInspector.SortableDataGridNode.prototype
}
......@@ -642,6 +661,29 @@ WebInspector.NetworkDataGridNode.ResponseCookiesCountComparator = function(a, b)
return (aScore - bScore) || a._request.indentityCompare(b._request);
}
/**
* @param {!WebInspector.NetworkDataGridNode} a
* @param {!WebInspector.NetworkDataGridNode} b
* @return {number}
*/
WebInspector.NetworkDataGridNode.InitialPriorityComparator = function(a, b)
{
var priorityMap = WebInspector.NetworkDataGridNode._symbolicToNumericPriority;
if (!priorityMap) {
WebInspector.NetworkDataGridNode._symbolicToNumericPriority = new Map();
priorityMap = WebInspector.NetworkDataGridNode._symbolicToNumericPriority;
priorityMap.set(NetworkAgent.ResourcePriority.VeryLow, 1);
priorityMap.set(NetworkAgent.ResourcePriority.Low, 2);
priorityMap.set(NetworkAgent.ResourcePriority.Medium, 3);
priorityMap.set(NetworkAgent.ResourcePriority.High, 4);
priorityMap.set(NetworkAgent.ResourcePriority.VeryHigh, 5);
}
var aScore = priorityMap.get(a._request.initialPriority()) || 0;
var bScore = priorityMap.get(b._request.initialPriority()) || 0;
return aScore - bScore || a._request.indentityCompare(b._request);
}
/**
* @param {string} propertyName
* @param {boolean} revert
......
......@@ -116,7 +116,7 @@ WebInspector.NetworkLogView._isMatchingSearchQuerySymbol = Symbol("isMatchingSea
WebInspector.NetworkLogView.HTTPSchemas = {"http": true, "https": true, "ws": true, "wss": true};
WebInspector.NetworkLogView._responseHeaderColumns = ["Cache-Control", "Connection", "Content-Encoding", "Content-Length", "ETag", "Keep-Alive", "Last-Modified", "Server", "Vary"];
WebInspector.NetworkLogView._defaultColumnsVisibility = {
method: false, status: true, protocol: false, scheme: false, domain: false, remoteAddress: false, type: true, initiator: true, cookies: false, setCookies: false, size: true, time: true, connectionId: false,
method: false, status: true, protocol: false, scheme: false, domain: false, remoteAddress: false, type: true, initiator: true, cookies: false, setCookies: false, size: true, time: true, priority: false, connectionId: false,
"Cache-Control": false, "Connection": false, "Content-Encoding": false, "Content-Length": false, "ETag": false, "Keep-Alive": false, "Last-Modified": false, "Server": false, "Vary": false
};
WebInspector.NetworkLogView._defaultRefreshDelay = 200;
......@@ -164,6 +164,7 @@ WebInspector.NetworkLogView._columnTitles = {
"size": WebInspector.UIString("Size"),
"time": WebInspector.UIString("Time"),
"connectionId": WebInspector.UIString("Connection Id"),
"priority": WebInspector.UIString("Priority"),
"timeline": WebInspector.UIString("Timeline"),
// Response header columns
......@@ -428,6 +429,12 @@ WebInspector.NetworkLogView.prototype = {
align: WebInspector.DataGrid.Align.Right
});
columns.push({
id: "priority",
title: WebInspector.NetworkLogView._columnTitles["priority"],
weight: 6
});
columns.push({
id: "connectionId",
title: WebInspector.NetworkLogView._columnTitles["connectionId"],
......@@ -615,6 +622,7 @@ WebInspector.NetworkLogView.prototype = {
this._sortingFunctions.size = WebInspector.NetworkDataGridNode.SizeComparator;
this._sortingFunctions.time = WebInspector.NetworkDataGridNode.RequestPropertyComparator.bind(null, "duration", false);
this._sortingFunctions.connectionId = WebInspector.NetworkDataGridNode.RequestPropertyComparator.bind(null, "connectionId", false);
this._sortingFunctions.priority = WebInspector.NetworkDataGridNode.InitialPriorityComparator;
this._sortingFunctions.timeline = WebInspector.NetworkDataGridNode.RequestPropertyComparator.bind(null, "startTime", false);
this._sortingFunctions.startTime = WebInspector.NetworkDataGridNode.RequestPropertyComparator.bind(null, "startTime", false);
this._sortingFunctions.endTime = WebInspector.NetworkDataGridNode.RequestPropertyComparator.bind(null, "endTime", false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment