<!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>[244577] 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/244577">244577</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-04-23 18:28:49 -0700 (Tue, 23 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/238168">r238168</a>): Network: preserve log doesn't show main frame main resource changes
https://bugs.webkit.org/show_bug.cgi?id=197220
<rdar://problem/49960464>

Reviewed by Timothy Hatcher.

* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype.reset):
(WI.NetworkTableContentView.prototype._addCollection):
(WI.NetworkTableContentView.prototype._resetCollection): Added.
(WI.NetworkTableContentView.prototype._changeCollection):
(WI.NetworkTableContentView.prototype._mainResourceDidChange):
We want to add the frame's main resource in the case that it's the main frame, but we also
want to clear the main collection of data (e.g. if viewing an imported HAR).
Drive-by: `_groupByDOMNodeNavigationItem` was renamed in a previous patch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTableContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (244576 => 244577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-04-24 01:20:32 UTC (rev 244576)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-04-24 01:28:49 UTC (rev 244577)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2019-04-23  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes
+        https://bugs.webkit.org/show_bug.cgi?id=197220
+        <rdar://problem/49960464>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype.reset):
+        (WI.NetworkTableContentView.prototype._addCollection):
+        (WI.NetworkTableContentView.prototype._resetCollection): Added.
+        (WI.NetworkTableContentView.prototype._changeCollection):
+        (WI.NetworkTableContentView.prototype._mainResourceDidChange):
+        We want to add the frame's main resource in the case that it's the main frame, but we also
+        want to clear the main collection of data (e.g. if viewing an imported HAR).
+        Drive-by: `_groupByDOMNodeNavigationItem` was renamed in a previous patch.
+
+2019-04-23  Devin Rousso  <drousso@apple.com>
+
</ins><span class="cx">         Web Inspector: Network: support drag/drop for importing
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=197221
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTableContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (244576 => 244577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js       2019-04-24 01:20:32 UTC (rev 244576)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js  2019-04-24 01:28:49 UTC (rev 244577)
</span><span class="lines">@@ -306,12 +306,7 @@
</span><span class="cx">     reset()
</span><span class="cx">     {
</span><span class="cx">         this._runForMainCollection((collection) => {
</span><del>-            collection.entries = [];
-            collection.filteredEntries = [];
-            collection.pendingInsertions = [];
-            collection.pendingUpdates = [];
-            collection.waterfallStartTime = NaN;
-            collection.waterfallEndTime = NaN;
</del><ins>+            this._resetCollection(collection);
</ins><span class="cx">         });
</span><span class="cx"> 
</span><span class="cx">         for (let detailView of this._detailViewMap.values())
</span><span class="lines">@@ -526,20 +521,22 @@
</span><span class="cx"> 
</span><span class="cx">     _addCollection()
</span><span class="cx">     {
</span><del>-        let collection = {
-            entries: [],
-            filteredEntries: [],
-            pendingInsertions: [],
-            pendingUpdates: [],
-            waterfallStartTime: NaN,
-            waterfallEndTime: NaN,
-        };
-
</del><ins>+        let collection = {};
+        this._resetCollection(collection);
</ins><span class="cx">         this._collections.push(collection);
</span><del>-
</del><span class="cx">         return collection;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    _resetCollection(collection)
+    {
+        collection.entries = [];
+        collection.filteredEntries = [];
+        collection.pendingInsertions = [];
+        collection.pendingUpdates = [];
+        collection.waterfallStartTime = NaN;
+        collection.waterfallEndTime = NaN;
+    }
+
</ins><span class="cx">     _setActiveCollection(collection)
</span><span class="cx">     {
</span><span class="cx">         console.assert(this._collections.includes(collection));
</span><span class="lines">@@ -586,7 +583,7 @@
</span><span class="cx"> 
</span><span class="cx">         let isMain = collection === this._mainCollection;
</span><span class="cx">         this._checkboxesNavigationItemGroup.hidden = !isMain;
</span><del>-        this._groupByDOMNodeNavigationItem.hidden = !isMain;
</del><ins>+        this._groupMediaRequestsByDOMNodeNavigationItem.hidden = !isMain;
</ins><span class="cx">         this._clearNetworkItemsNavigationItem.enabled = isMain;
</span><span class="cx">         this._collectionsPathNavigationItem.components = [this._pathComponentsMap.get(collection)];
</span><span class="cx"> 
</span><span class="lines">@@ -1588,13 +1585,11 @@
</span><span class="cx"> 
</span><span class="cx">     _mainResourceDidChange(event)
</span><span class="cx">     {
</span><del>-        let frame = event.target;
-        if (!frame.isMainFrame() || !WI.settings.clearNetworkOnNavigate.value)
-            return;
</del><ins>+        this._runForMainCollection((collection) => {
+            let frame = event.target;
+            if (frame.isMainFrame() && WI.settings.clearNetworkOnNavigate.value)
+                this._resetCollection(collection);
</ins><span class="cx"> 
</span><del>-        this.reset();
-
-        this._runForMainCollection((collection) => {
</del><span class="cx">             if (this._transitioningPageTarget) {
</span><span class="cx">                 this._transitioningPageTarget = false;
</span><span class="cx">                 this._needsInitialPopulate = true;
</span></span></pre>
</div>
</div>

</body>
</html>