<!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>[180319] 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/180319">180319</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 15:55:25 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Inspecting a page where resources are in folders forces folder organization on every subsequent page
https://bugs.webkit.org/show_bug.cgi?id=141397
Reviewed by Timothy Hatcher.
When removeChildren is called on an instance of a FolderizedTreeElement, the element's _groupedIntoFolders flag
will now be set to false. This will prevent unnecessary folderization upon a frame navigation. Also during an
onpopulate event, addChildForRepresentedObject is called repeatedly and much of the work done during each call
was unnecessary. That work has now been partially removed and partially relocated to a function that is only
called at the beginning of an onpopulate event.
* UserInterface/Views/FolderizedTreeElement.js:
(WebInspector.FolderizedTreeElement.prototype.set removeChildren): Set _groupedIntoFolders to false.
(WebInspector.FolderizedTreeElement.prototype.addChildForRepresentedObject): Remove unnecessary treeOutline
emptiness check, and move _shouldGroupIntoFolders() check to new function prepareToPopulate().
(WebInspector.FolderizedTreeElement.prototype.prepareToPopulate): Create.
(WebInspector.FolderizedTreeElement.prototype._populateFromNewChildQueue): Call prepareToPopulate().
* UserInterface/Views/FrameTreeElement.js:
(WebInspector.FrameTreeElement.prototype.onpopulate): Call prepareToPopulate().
* UserInterface/Views/GeneralTreeElement.js: Drive-by inheritance style fix.
* UserInterface/Views/ResourceTreeElement.js: Drive-by inheritance style fix.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFolderizedTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGeneralTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (180318 => 180319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-18 23:54:19 UTC (rev 180318)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-18 23:55:25 UTC (rev 180319)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-02-18 Jono Wells <jonowells@apple.com>
+
+ Web Inspector: Inspecting a page where resources are in folders forces folder organization on every subsequent page
+ https://bugs.webkit.org/show_bug.cgi?id=141397
+
+ Reviewed by Timothy Hatcher.
+
+ When removeChildren is called on an instance of a FolderizedTreeElement, the element's _groupedIntoFolders flag
+ will now be set to false. This will prevent unnecessary folderization upon a frame navigation. Also during an
+ onpopulate event, addChildForRepresentedObject is called repeatedly and much of the work done during each call
+ was unnecessary. That work has now been partially removed and partially relocated to a function that is only
+ called at the beginning of an onpopulate event.
+
+ * UserInterface/Views/FolderizedTreeElement.js:
+ (WebInspector.FolderizedTreeElement.prototype.set removeChildren): Set _groupedIntoFolders to false.
+ (WebInspector.FolderizedTreeElement.prototype.addChildForRepresentedObject): Remove unnecessary treeOutline
+ emptiness check, and move _shouldGroupIntoFolders() check to new function prepareToPopulate().
+ (WebInspector.FolderizedTreeElement.prototype.prepareToPopulate): Create.
+ (WebInspector.FolderizedTreeElement.prototype._populateFromNewChildQueue): Call prepareToPopulate().
+
+ * UserInterface/Views/FrameTreeElement.js:
+ (WebInspector.FrameTreeElement.prototype.onpopulate): Call prepareToPopulate().
+
+ * UserInterface/Views/GeneralTreeElement.js: Drive-by inheritance style fix.
+ * UserInterface/Views/ResourceTreeElement.js: Drive-by inheritance style fix.
+
</ins><span class="cx"> 2015-02-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ES6: Improved Console Support for Promise Objects
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFolderizedTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js (180318 => 180319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js 2015-02-18 23:54:19 UTC (rev 180318)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js 2015-02-18 23:55:25 UTC (rev 180319)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx"> folder.removeChildren();
</span><span class="cx">
</span><span class="cx"> this._folderTypeMap.clear();
</span><ins>+
+ this._groupedIntoFolders = false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="lines">@@ -101,21 +103,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this.updateParentStatus();
-
- if (!this.treeOutline) {
- // Just mark as needing to update to avoid doing work that might not be needed.
- this.shouldRefreshChildren = true;
- return;
- }
-
- if (!this._groupedIntoFolders && this._shouldGroupIntoFolders()) {
- // Mark as needing a refresh to rebuild the tree into folders.
- this._groupedIntoFolders = true;
- this.shouldRefreshChildren = true;
- return;
- }
-
</del><span class="cx"> var childTreeElement = this.treeOutline.getCachedTreeElement(representedObject);
</span><span class="cx"> if (!childTreeElement)
</span><span class="cx"> childTreeElement = new settings.treeElementConstructor(representedObject);
</span><span class="lines">@@ -172,6 +159,12 @@
</span><span class="cx"> this.removeChildren();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ prepareToPopulate: function()
+ {
+ if (!this._groupedIntoFolders && this._shouldGroupIntoFolders())
+ this._groupedIntoFolders = true;
+ },
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _clearNewChildQueue: function()
</span><span class="lines">@@ -191,6 +184,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this.prepareToPopulate();
+
</ins><span class="cx"> for (var i = 0; i < this._newChildQueue.length; ++i)
</span><span class="cx"> this.addChildForRepresentedObject(this._newChildQueue[i]);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js (180318 => 180319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2015-02-18 23:54:19 UTC (rev 180318)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2015-02-18 23:55:25 UTC (rev 180319)
</span><span class="lines">@@ -229,10 +229,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (this.children.length && !this.shouldRefreshChildren)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> this.shouldRefreshChildren = false;
</span><span class="cx">
</span><span class="cx"> this.removeChildren();
</span><ins>+ this.updateParentStatus();
+ this.prepareToPopulate();
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < this._frame.childFrames.length; ++i)
</span><span class="cx"> this.addChildForRepresentedObject(this._frame.childFrames[i]);
</span><span class="lines">@@ -250,6 +251,7 @@
</span><span class="cx"> var flowMap = this._frame.domTree.flowMap;
</span><span class="cx"> for (var flowKey in flowMap)
</span><span class="cx"> this.addChildForRepresentedObject(flowMap[flowKey]);
</span><ins>+
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> onexpand: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGeneralTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js (180318 => 180319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js 2015-02-18 23:54:19 UTC (rev 180318)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js 2015-02-18 23:55:25 UTC (rev 180319)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.GeneralTreeElement.prototype = {
</span><span class="cx"> constructor: WebInspector.GeneralTreeElement,
</span><ins>+ __proto__: TreeElement.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -394,5 +395,3 @@
</span><span class="cx"> this._statusElement.textContent = this._status;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.GeneralTreeElement.prototype.__proto__ = TreeElement.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (180318 => 180319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-02-18 23:54:19 UTC (rev 180318)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-02-18 23:55:25 UTC (rev 180319)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ResourceTreeElement.prototype = {
</span><span class="cx"> constructor: WebInspector.ResourceTreeElement,
</span><ins>+ __proto__: WebInspector.SourceCodeTreeElement.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -194,5 +195,3 @@
</span><span class="cx"> this.callFirstAncestorFunction("descendantResourceTreeElementTypeDidChange", [this, event.data.oldType]);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ResourceTreeElement.prototype.__proto__ = WebInspector.SourceCodeTreeElement.prototype;
</del></span></pre>
</div>
</div>
</body>
</html>