<!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>[214903] trunk/Source/WebInspectorUI</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/214903">214903</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-04 15:14:31 -0700 (Tue, 04 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Include more Network information in Resource Details Sidebar
https://bugs.webkit.org/show_bug.cgi?id=170470
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-04-04
Reviewed by Brian Burg.
* Localizations/en.lproj/localizedStrings.js:
Updated localized strings.
* UserInterface/Models/Resource.js:
(WebInspector.Resource.displayNameForProtocol):
(WebInspector.Resource.displayNameForPriority):
Aggregate all display name helpers here.
* UserInterface/Views/DetailsSectionSimpleRow.js:
(WebInspector.DetailsSectionSimpleRow.prototype.get tooltip):
(WebInspector.DetailsSectionSimpleRow.prototype.set tooltip):
Allow setting a tooltip on the value.
* UserInterface/Views/NetworkGridContentView.css:
(.cache-type):
Cache type shows up in multiple places. Simplify the CSS to apply anywhere.
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView):
* UserInterface/Views/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView):
Updated column names.
* UserInterface/Views/ResourceDetailsSidebarPanel.js:
(WebInspector.ResourceDetailsSidebarPanel):
(WebInspector.ResourceDetailsSidebarPanel.prototype._refreshRequestAndResponse):
(WebInspector.ResourceDetailsSidebarPanel.prototype._cachedRowValue):
Include more detail information in the sidebar.
* UserInterface/Views/ResourceTimelineDataGridNode.js:
(WebInspector.ResourceTimelineDataGridNode.prototype.createCellContent):
(WebInspector.ResourceTimelineDataGridNode.prototype._displayNameForPriority): Deleted.
Use shared code for display names.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionSimpleRowjs">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2017-04-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Include more Network information in Resource Details Sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=170470
+
+ Reviewed by Brian Burg.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Updated localized strings.
+
+ * UserInterface/Models/Resource.js:
+ (WebInspector.Resource.displayNameForProtocol):
+ (WebInspector.Resource.displayNameForPriority):
+ Aggregate all display name helpers here.
+
+ * UserInterface/Views/DetailsSectionSimpleRow.js:
+ (WebInspector.DetailsSectionSimpleRow.prototype.get tooltip):
+ (WebInspector.DetailsSectionSimpleRow.prototype.set tooltip):
+ Allow setting a tooltip on the value.
+
+ * UserInterface/Views/NetworkGridContentView.css:
+ (.cache-type):
+ Cache type shows up in multiple places. Simplify the CSS to apply anywhere.
+
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView):
+ Updated column names.
+
+ * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+ (WebInspector.ResourceDetailsSidebarPanel):
+ (WebInspector.ResourceDetailsSidebarPanel.prototype._refreshRequestAndResponse):
+ (WebInspector.ResourceDetailsSidebarPanel.prototype._cachedRowValue):
+ Include more detail information in the sidebar.
+
+ * UserInterface/Views/ResourceTimelineDataGridNode.js:
+ (WebInspector.ResourceTimelineDataGridNode.prototype.createCellContent):
+ (WebInspector.ResourceTimelineDataGridNode.prototype._displayNameForPriority): Deleted.
+ Use shared code for display names.
+
</ins><span class="cx"> 2017-04-04 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RTL: fix alignment of close button shown while docked
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> localizedStrings["Connection"] = "Connection";
</span><span class="cx"> localizedStrings["Connection Close Frame"] = "Connection Close Frame";
</span><span class="cx"> localizedStrings["Connection Closed"] = "Connection Closed";
</span><ins>+localizedStrings["Connection ID"] = "Connection ID";
</ins><span class="cx"> localizedStrings["Console"] = "Console";
</span><span class="cx"> localizedStrings["Console Evaluation"] = "Console Evaluation";
</span><span class="cx"> localizedStrings["Console Evaluation %d"] = "Console Evaluation %d";
</span><span class="lines">@@ -432,6 +433,7 @@
</span><span class="cx"> localizedStrings["Highest: %s"] = "Highest: %s";
</span><span class="cx"> localizedStrings["Horizontal"] = "Horizontal";
</span><span class="cx"> localizedStrings["Host"] = "Host";
</span><ins>+localizedStrings["IP Address"] = "IP Address";
</ins><span class="cx"> localizedStrings["Icon Only"] = "Icon Only";
</span><span class="cx"> localizedStrings["Icon and Text (Horizontal)"] = "Icon and Text (Horizontal)";
</span><span class="cx"> localizedStrings["Icon and Text (Vertical)"] = "Icon and Text (Vertical)";
</span><span class="lines">@@ -653,7 +655,6 @@
</span><span class="cx"> localizedStrings["Region Flow"] = "Region Flow";
</span><span class="cx"> localizedStrings["Region announced in its entirety."] = "Region announced in its entirety.";
</span><span class="cx"> localizedStrings["Reload page (%s)\nReload ignoring cache (%s)"] = "Reload page (%s)\nReload ignoring cache (%s)";
</span><del>-localizedStrings["Remote Address"] = "Remote Address";
</del><span class="cx"> localizedStrings["Removals"] = "Removals";
</span><span class="cx"> localizedStrings["Remove Watch Expression"] = "Remove Watch Expression";
</span><span class="cx"> localizedStrings["Remove link"] = "Remove link";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -137,6 +137,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static displayNameForProtocol(protocol)
+ {
+ switch (protocol) {
+ case "h2":
+ return "HTTP/2";
+ case "http/1.0":
+ return "HTTP/1.0";
+ case "http/1.1":
+ return "HTTP/1.1";
+ case "spdy/2":
+ return "SPDY/2";
+ case "spdy/3":
+ return "SPDY/3";
+ case "spdy/3.1":
+ return "SPDY/3.1";
+ default:
+ return null;
+ }
+ }
+
+ static displayNameForPriority(priority)
+ {
+ switch (priority) {
+ case WebInspector.Resource.NetworkPriority.Low:
+ return WebInspector.UIString("Low");
+ case WebInspector.Resource.NetworkPriority.Medium:
+ return WebInspector.UIString("Medium");
+ case WebInspector.Resource.NetworkPriority.High:
+ return WebInspector.UIString("High");
+ default:
+ return null;
+ }
+ }
+
</ins><span class="cx"> static responseSourceFromPayload(source)
</span><span class="cx"> {
</span><span class="cx"> if (!source)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionSimpleRowjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -109,6 +109,16 @@
</span><span class="cx"> } else
</span><span class="cx"> this._valueElement.textContent = this._value;
</span><span class="cx"> }
</span><ins>+
+ get tooltip()
+ {
+ return this._valueElement.title;
+ }
+
+ set tooltip(x)
+ {
+ this._valueElement.title = x;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DetailsSectionSimpleRow.DataStyleClassName = "data";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> filter: grayscale();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view:matches(.network, .network-grid) > .data-grid .cache-type {
</del><ins>+.cache-type {
</ins><span class="cx"> color: gray;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -67,11 +67,11 @@
</span><span class="cx"> columns.priority.width = "5%";
</span><span class="cx"> columns.priority.hidden = true;
</span><span class="cx">
</span><del>- columns.remoteAddress.title = WebInspector.UIString("Remote Address");
</del><ins>+ columns.remoteAddress.title = WebInspector.UIString("IP Address");
</ins><span class="cx"> columns.remoteAddress.width = "8%";
</span><span class="cx"> columns.remoteAddress.hidden = true;
</span><span class="cx">
</span><del>- columns.connectionIdentifier.title = WebInspector.UIString("Connection");
</del><ins>+ columns.connectionIdentifier.title = WebInspector.UIString("Connection ID");
</ins><span class="cx"> columns.connectionIdentifier.width = "5%";
</span><span class="cx"> columns.connectionIdentifier.hidden = true;
</span><span class="cx"> columns.connectionIdentifier.aligned = "right";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -73,11 +73,11 @@
</span><span class="cx"> columns.priority.width = "5%";
</span><span class="cx"> columns.priority.hidden = true;
</span><span class="cx">
</span><del>- columns.remoteAddress.title = WebInspector.UIString("Remote Address");
</del><ins>+ columns.remoteAddress.title = WebInspector.UIString("IP Address");
</ins><span class="cx"> columns.remoteAddress.width = "8%";
</span><span class="cx"> columns.remoteAddress.hidden = true;
</span><span class="cx">
</span><del>- columns.connectionIdentifier.title = WebInspector.UIString("Connection");
</del><ins>+ columns.connectionIdentifier.title = WebInspector.UIString("Connection ID");
</ins><span class="cx"> columns.connectionIdentifier.width = "5%";
</span><span class="cx"> columns.connectionIdentifier.hidden = true;
</span><span class="cx"> columns.connectionIdentifier.aligned = "right";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx"> this._statusTextRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Status"));
</span><span class="cx"> this._statusCodeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Code"));
</span><span class="cx">
</span><ins>+ this._remoteAddressRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("IP Address"));
+ this._connectionIdentifierRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Connection ID"));
+
</ins><span class="cx"> this._encodedSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Encoded"));
</span><span class="cx"> this._decodedSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Decoded"));
</span><span class="cx"> this._transferSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Transferred"));
</span><span class="lines">@@ -84,10 +87,11 @@
</span><span class="cx">
</span><span class="cx"> let requestGroup = new WebInspector.DetailsSectionGroup([this._requestMethodRow, this._protocolRow, this._priorityRow, this._cachedRow]);
</span><span class="cx"> let statusGroup = new WebInspector.DetailsSectionGroup([this._statusTextRow, this._statusCodeRow]);
</span><ins>+ let connectionGroup = new WebInspector.DetailsSectionGroup([this._remoteAddressRow, this._connectionIdentifierRow]);
</ins><span class="cx"> let sizeGroup = new WebInspector.DetailsSectionGroup([this._encodedSizeRow, this._decodedSizeRow, this._transferSizeRow]);
</span><span class="cx"> let compressionGroup = new WebInspector.DetailsSectionGroup([this._compressedRow, this._compressionRow]);
</span><span class="cx">
</span><del>- this._requestAndResponseSection = new WebInspector.DetailsSection("resource-request-response", WebInspector.UIString("Request & Response"), [requestGroup, statusGroup, sizeGroup, compressionGroup]);
</del><ins>+ this._requestAndResponseSection = new WebInspector.DetailsSection("resource-request-response", WebInspector.UIString("Request & Response"), [requestGroup, statusGroup, connectionGroup, sizeGroup, compressionGroup]);
</ins><span class="cx">
</span><span class="cx"> this._requestHeadersRow = new WebInspector.DetailsSectionDataGridRow(null, WebInspector.UIString("No Request Headers"));
</span><span class="cx"> this._requestHeadersSection = new WebInspector.DetailsSection("resource-request-headers", WebInspector.UIString("Request Headers"));
</span><span class="lines">@@ -312,25 +316,15 @@
</span><span class="cx">
</span><span class="cx"> // COMPATIBILITY(iOS 10.3): Network load metrics were not previously available.
</span><span class="cx"> if (window.NetworkAgent && NetworkAgent.hasEventParameter("loadingFinished", "metrics")) {
</span><del>- this._protocolRow.value = this._resource.protocol || emDash;
-
- switch (this._resource.priority) {
- case WebInspector.Resource.NetworkPriority.Low:
- this._priorityRow.value = WebInspector.UIString("Low");
- break;
- case WebInspector.Resource.NetworkPriority.Medium:
- this._priorityRow.value = WebInspector.UIString("Medium");
- break;
- case WebInspector.Resource.NetworkPriority.High:
- this._priorityRow.value = WebInspector.UIString("High");
- break;
- default:
- this._priorityRow.value = emDash;
- break;
- }
</del><ins>+ let protocolDisplayName = WebInspector.Resource.displayNameForProtocol(this._resource.protocol);
+ this._protocolRow.value = protocolDisplayName || emDash;
+ this._protocolRow.tooltip = protocolDisplayName ? this._resource.protocol : "";
+ this._priorityRow.value = WebInspector.Resource.displayNameForPriority(this._resource.priority) || emDash;
+ this._remoteAddressRow.value = this._resource.remoteAddress || emDash;
+ this._connectionIdentifierRow.value = this._resource.connectionIdentifier || emDash;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- this._cachedRow.value = this._resource.cached ? WebInspector.UIString("Yes") : WebInspector.UIString("No");
</del><ins>+ this._cachedRow.value = this._cachedRowValue();
</ins><span class="cx">
</span><span class="cx"> this._statusCodeRow.value = this._resource.statusCode || emDash;
</span><span class="cx"> this._statusTextRow.value = this._resource.statusText || emDash;
</span><span class="lines">@@ -469,6 +463,22 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _cachedRowValue()
+ {
+ let responseSource = this._resource.responseSource;
+ if (responseSource === WebInspector.Resource.ResponseSource.MemoryCache || responseSource === WebInspector.Resource.ResponseSource.DiskCache) {
+ console.assert(this._resource.cached, "This resource has a cache responseSource it should also be marked as cached", this._resource);
+ let span = document.createElement("span");
+ let cacheType = document.createElement("span");
+ cacheType.classList = "cache-type";
+ cacheType.textContent = responseSource === WebInspector.Resource.ResponseSource.MemoryCache ? WebInspector.UIString("(Memory)") : WebInspector.UIString("(Disk)");
+ span.append(WebInspector.UIString("Yes"), " ", cacheType);
+ return span;
+ }
+
+ return this._resource.cached ? WebInspector.UIString("Yes") : WebInspector.UIString("No");
+ }
+
</ins><span class="cx"> _goToRequestDataClicked()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.showResourceRequest(this._resource);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js (214902 => 214903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2017-04-04 22:05:36 UTC (rev 214902)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2017-04-04 22:14:31 UTC (rev 214903)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> return value || emDash;
</span><span class="cx">
</span><span class="cx"> case "priority":
</span><del>- return this._displayNameForPriority(value);
</del><ins>+ return WebInspector.Resource.displayNameForPriority(value) || emDash;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return super.createCellContent(columnIdentifier, cell);
</span><span class="lines">@@ -200,20 +200,6 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _displayNameForPriority(priority)
- {
- switch (priority) {
- case WebInspector.Resource.NetworkPriority.Low:
- return WebInspector.UIString("Low");
- case WebInspector.Resource.NetworkPriority.Medium:
- return WebInspector.UIString("Medium");
- case WebInspector.Resource.NetworkPriority.High:
- return WebInspector.UIString("High");
- }
-
- return emDash;
- }
-
</del><span class="cx"> _createNameCellDocumentFragment()
</span><span class="cx"> {
</span><span class="cx"> let fragment = document.createDocumentFragment();
</span></span></pre>
</div>
</div>
</body>
</html>