<!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>[211451] 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/211451">211451</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-31 15:22:56 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Network tab: provide a way to preserve log on navigation
https://bugs.webkit.org/show_bug.cgi?id=166908
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2017-01-31
Reviewed by Matt Baker.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Base/Setting.js:
(WebInspector.settings):
Add clearNetworkOnNavigate global setting.
* UserInterface/Views/NetworkGridContentView.css:
(.content-view.network-grid > .data-grid .preserved:not(.selected) .cell-content):
(.content-view.network-grid > .data-grid .preserved:not(.selected) .cell-content .timeline-record-bar > .segment):
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView):
(WebInspector.NetworkGridContentView.prototype._mainResourceDidChange):
* UserInterface/Views/NetworkSidebarPanel.css:
(.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > :not(.status)):
(.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > .icon):
* UserInterface/Views/NetworkSidebarPanel.js:
(WebInspector.NetworkSidebarPanel):
(WebInspector.NetworkSidebarPanel.prototype._mainResourceDidChange):
Add styling to preserved network records.
* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager.prototype._mainResourceDidChange):
Only reset the persistent network timeline if the clearNetworkOnNavigate setting is true.
* UserInterface/Views/SettingsTabContentView.js:
(WebInspector.SettingsTabContentView.prototype.initialLayout):
(WebInspector.SettingsTabContentView):
Add checkbox and spacers for new setting.</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="#trunkSourceWebInspectorUIUserInterfaceBaseSettingjs">trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.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="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2017-01-31 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Network tab: provide a way to preserve log on navigation
+ https://bugs.webkit.org/show_bug.cgi?id=166908
+
+ Reviewed by Matt Baker.
+
+ * Localizations/en.lproj/localizedStrings.js:
+
+ * UserInterface/Base/Setting.js:
+ (WebInspector.settings):
+ Add clearNetworkOnNavigate global setting.
+
+ * UserInterface/Views/NetworkGridContentView.css:
+ (.content-view.network-grid > .data-grid .preserved:not(.selected) .cell-content):
+ (.content-view.network-grid > .data-grid .preserved:not(.selected) .cell-content .timeline-record-bar > .segment):
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ (WebInspector.NetworkGridContentView.prototype._mainResourceDidChange):
+ * UserInterface/Views/NetworkSidebarPanel.css:
+ (.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > :not(.status)):
+ (.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > .icon):
+ * UserInterface/Views/NetworkSidebarPanel.js:
+ (WebInspector.NetworkSidebarPanel):
+ (WebInspector.NetworkSidebarPanel.prototype._mainResourceDidChange):
+ Add styling to preserved network records.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._mainResourceDidChange):
+ Only reset the persistent network timeline if the clearNetworkOnNavigate setting is true.
+
+ * UserInterface/Views/SettingsTabContentView.js:
+ (WebInspector.SettingsTabContentView.prototype.initialLayout):
+ (WebInspector.SettingsTabContentView):
+ Add checkbox and spacers for new setting.
+
+2017-01-31 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: User Settings: Secondary-clicking the New Tab and Settings tabs should not produce a context menu
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167651
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -512,6 +512,7 @@
</span><span class="cx"> localizedStrings["Network"] = "Network";
</span><span class="cx"> localizedStrings["Network Issue"] = "Network Issue";
</span><span class="cx"> localizedStrings["Network Requests"] = "Network Requests";
</span><ins>+localizedStrings["Network:"] = "Network:";
</ins><span class="cx"> localizedStrings["New Rule"] = "New Rule";
</span><span class="cx"> localizedStrings["New Tab"] = "New Tab";
</span><span class="cx"> localizedStrings["No"] = "No";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseSettingjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -110,5 +110,6 @@
</span><span class="cx"> showWhitespaceCharacters: new WebInspector.Setting("show-whitespace-characters", false),
</span><span class="cx"> showInvalidCharacters: new WebInspector.Setting("show-invalid-characters", false),
</span><span class="cx"> clearLogOnNavigate: new WebInspector.Setting("clear-log-on-navigate", true),
</span><ins>+ clearNetworkOnNavigate: new WebInspector.Setting("clear-network-on-navigate", true),
</ins><span class="cx"> zoomFactor: new WebInspector.Setting("zoom-factor", 1),
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -804,7 +804,7 @@
</span><span class="cx"> _mainResourceDidChange(event)
</span><span class="cx"> {
</span><span class="cx"> let frame = event.target;
</span><del>- if (frame.isMainFrame())
</del><ins>+ if (frame.isMainFrame() && WebInspector.settings.clearNetworkOnNavigate.value)
</ins><span class="cx"> this._persistentNetworkTimeline.reset();
</span><span class="cx">
</span><span class="cx"> let mainResource = frame.mainResource;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -34,3 +34,11 @@
</span><span class="cx"> .content-view.network-grid > .data-grid th {
</span><span class="cx"> border-top: none;
</span><span class="cx"> }
</span><ins>+
+.content-view.network-grid > .data-grid .preserved:not(.selected) .cell-content {
+ opacity: 0.5;
+}
+
+.content-view.network-grid > .data-grid .preserved:not(.selected) .cell-content .timeline-record-bar > .segment {
+ filter: grayscale();
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx">
</span><span class="cx"> super(representedObject);
</span><span class="cx">
</span><ins>+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+
</ins><span class="cx"> this._networkSidebarPanel = extraArguments.networkSidebarPanel;
</span><span class="cx">
</span><span class="cx"> this._contentTreeOutline = this._networkSidebarPanel.contentTreeOutline;
</span><span class="lines">@@ -248,6 +250,16 @@
</span><span class="cx"> this._pendingRecords = [];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _mainResourceDidChange(event)
+ {
+ let frame = event.target;
+ if (!frame.isMainFrame() || WebInspector.settings.clearNetworkOnNavigate.value)
+ return;
+
+ for (let dataGridNode of this._dataGrid.children)
+ dataGridNode.element.classList.add("preserved");
+ }
+
</ins><span class="cx"> _networkTimelineReset(event)
</span><span class="cx"> {
</span><span class="cx"> this.reset();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -95,3 +95,11 @@
</span><span class="cx"> background-image: linear-gradient(to bottom, transparent, transparent 50%, hsla(0, 0%, 0%, 0.03) 50%, hsla(0, 0%, 0%, 0.03));
</span><span class="cx"> background-size: 100% 40px;
</span><span class="cx"> }
</span><ins>+
+.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > :not(.status) {
+ opacity: 0.5;
+}
+
+.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > .icon {
+ filter: grayscale();
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> {
</span><span class="cx"> super("network", WebInspector.UIString("Network"), false);
</span><span class="cx">
</span><ins>+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+
</ins><span class="cx"> this.contentBrowser = contentBrowser;
</span><span class="cx">
</span><span class="cx"> this.filterBar.placeholder = WebInspector.UIString("Filter Resource List");
</span><span class="lines">@@ -171,6 +173,16 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><ins>+ _mainResourceDidChange(event)
+ {
+ let frame = event.target;
+ if (!frame.isMainFrame() || WebInspector.settings.clearNetworkOnNavigate.value)
+ return;
+
+ for (let treeElement of this.contentTreeOutline.children)
+ treeElement.element.classList.add("preserved");
+ }
+
</ins><span class="cx"> _networkTimelineReset(event)
</span><span class="cx"> {
</span><span class="cx"> this.contentBrowser.contentViewContainer.closeAllContentViews();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (211450 => 211451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-01-31 22:44:54 UTC (rev 211450)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-01-31 23:22:56 UTC (rev 211451)
</span><span class="lines">@@ -152,6 +152,15 @@
</span><span class="cx">
</span><span class="cx"> this.element.appendChild(document.createElement("br"));
</span><span class="cx">
</span><ins>+ createContainer(WebInspector.UIString("Network:"), (valueControllerContainer) => {
+ let checkbox = createCheckbox(WebInspector.settings.clearNetworkOnNavigate);
+ valueControllerContainer.appendChild(checkbox);
+
+ valueControllerContainer.append(WebInspector.UIString("Clear when page navigates"));
+ });
+
+ this.element.appendChild(document.createElement("br"));
+
</ins><span class="cx"> createContainer(WebInspector.UIString("Console:"), (valueControllerContainer) => {
</span><span class="cx"> let checkbox = createCheckbox(WebInspector.settings.clearLogOnNavigate);
</span><span class="cx"> valueControllerContainer.appendChild(checkbox);
</span></span></pre>
</div>
</div>
</body>
</html>