<!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>[208337] 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/208337">208337</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-03 11:42:12 -0700 (Thu, 03 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Modify FolderTreeElement to have a Collection as a its represented object
https://bugs.webkit.org/show_bug.cgi?id=164349
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-11-03
Reviewed by Matt Baker.
* UserInterface/Views/FolderTreeElement.js:
(WebInspector.FolderTreeElement):
Now accepts a representedObject parameter, which must be a WebInspector.Collection.
* UserInterface/Views/FolderizedTreeElement.js:
(WebInspector.FolderizedTreeElement.prototype.registerFolderizeSettings):
(WebInspector.FolderizedTreeElement.prototype.updateParentStatus):
(WebInspector.FolderizedTreeElement.prototype._parentTreeElementForRepresentedObject):
(WebInspector.FolderizedTreeElement.prototype._settingsForRepresentedObject):
(WebInspector.FolderizedTreeElement.prototype._shouldGroupIntoFolders):
(WebInspector.FolderizedTreeElement):
Rework the logic for creating WebInspector.FolderTreeElement so that items for the
representedObject parameter may be passed in via registerFolderizeSettings.
* UserInterface/Views/FrameTreeElement.js:
(WebInspector.FrameTreeElement):
(WebInspector.FrameTreeElement.): Deleted.
(WebInspector.FrameTreeElement.makeChildCountCallback): Deleted.
Rework logic for calling registerFolderizeSettings to support the representedObject
parameter. Also changed calls to WebInspector.Frame to support the
WebInspector.Collection class.
* UserInterface/Views/ResourceSidebarPanel.js:
(WebInspector.ResourceSidebarPanel.prototype.treeElementForRepresentedObject):
(WebInspector.ResourceSidebarPanel.prototype._scriptWasAdded):
(WebInspector.ResourceSidebarPanel.prototype._scriptsCleared):
Create WebInspector.Collection instances of Script model objects for additional folders
created by the Resources sidebar:
- Anonymous Scripts
- Extension Scripts
- Extra Scripts</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFolderTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js</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="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (208336 => 208337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-11-03 18:04:51 UTC (rev 208336)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-11-03 18:42:12 UTC (rev 208337)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-11-03 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Modify FolderTreeElement to have a Collection as a its represented object
+ https://bugs.webkit.org/show_bug.cgi?id=164349
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Views/FolderTreeElement.js:
+ (WebInspector.FolderTreeElement):
+ Now accepts a representedObject parameter, which must be a WebInspector.Collection.
+
+ * UserInterface/Views/FolderizedTreeElement.js:
+ (WebInspector.FolderizedTreeElement.prototype.registerFolderizeSettings):
+ (WebInspector.FolderizedTreeElement.prototype.updateParentStatus):
+ (WebInspector.FolderizedTreeElement.prototype._parentTreeElementForRepresentedObject):
+ (WebInspector.FolderizedTreeElement.prototype._settingsForRepresentedObject):
+ (WebInspector.FolderizedTreeElement.prototype._shouldGroupIntoFolders):
+ (WebInspector.FolderizedTreeElement):
+ Rework the logic for creating WebInspector.FolderTreeElement so that items for the
+ representedObject parameter may be passed in via registerFolderizeSettings.
+
+ * UserInterface/Views/FrameTreeElement.js:
+ (WebInspector.FrameTreeElement):
+ (WebInspector.FrameTreeElement.): Deleted.
+ (WebInspector.FrameTreeElement.makeChildCountCallback): Deleted.
+ Rework logic for calling registerFolderizeSettings to support the representedObject
+ parameter. Also changed calls to WebInspector.Frame to support the
+ WebInspector.Collection class.
+
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype.treeElementForRepresentedObject):
+ (WebInspector.ResourceSidebarPanel.prototype._scriptWasAdded):
+ (WebInspector.ResourceSidebarPanel.prototype._scriptsCleared):
+ Create WebInspector.Collection instances of Script model objects for additional folders
+ created by the Resources sidebar:
+ - Anonymous Scripts
+ - Extension Scripts
+ - Extra Scripts
+
</ins><span class="cx"> 2016-11-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Include DebuggerAgent in Workers - see, pause, and step through scripts
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFolderTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js (208336 => 208337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js 2016-11-03 18:04:51 UTC (rev 208336)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js 2016-11-03 18:42:12 UTC (rev 208337)
</span><span class="lines">@@ -25,22 +25,15 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.FolderTreeElement = class FolderTreeElement extends WebInspector.GeneralTreeElement
</span><span class="cx"> {
</span><del>- constructor(title, subtitle, additionalClassNames, representedObject)
</del><ins>+ constructor(title, representedObject)
</ins><span class="cx"> {
</span><del>- var classNames;
- if (!additionalClassNames)
- classNames = [];
- else if (additionalClassNames.constructor === Array)
- classNames = additionalClassNames;
- else if (typeof additionalClassNames === "string")
- classNames = [additionalClassNames];
</del><ins>+ console.assert(!representedObject || representedObject instanceof WebInspector.Collection);
</ins><span class="cx">
</span><del>- classNames.unshift(WebInspector.FolderTreeElement.FolderIconStyleClassName);
-
- super(classNames, title, subtitle, representedObject, true);
</del><ins>+ const classNames = [WebInspector.FolderTreeElement.FolderIconStyleClassName];
+ const subtitle = null;
+ const hasChildren = true;
+ super(classNames, title, subtitle, representedObject, hasChildren);
</ins><span class="cx"> }
</span><del>-
- // No Methods or Properties
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.FolderTreeElement.FolderIconStyleClassName = "folder-icon";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFolderizedTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js (208336 => 208337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js 2016-11-03 18:04:51 UTC (rev 208336)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js 2016-11-03 18:42:12 UTC (rev 208337)
</span><span class="lines">@@ -51,20 +51,18 @@
</span><span class="cx"> this._folderSettingsKey = x;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- registerFolderizeSettings(type, folderDisplayName, validateRepresentedObjectCallback, countChildrenCallback, treeElementConstructor)
</del><ins>+ registerFolderizeSettings(type, displayName, representedObject, treeElementConstructor)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(type);
</span><del>- console.assert(folderDisplayName);
- console.assert(typeof validateRepresentedObjectCallback === "function");
- console.assert(typeof countChildrenCallback === "function");
</del><ins>+ console.assert(displayName);
+ console.assert(representedObject);
</ins><span class="cx"> console.assert(typeof treeElementConstructor === "function");
</span><span class="cx">
</span><del>- var settings = {
</del><ins>+ let settings = {
</ins><span class="cx"> type,
</span><del>- folderDisplayName,
- validateRepresentedObjectCallback,
- countChildrenCallback,
- treeElementConstructor
</del><ins>+ displayName,
+ representedObject,
+ treeElementConstructor,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this._folderizeSettingsMap.set(type, settings);
</span><span class="lines">@@ -147,9 +145,9 @@
</span><span class="cx">
</span><span class="cx"> updateParentStatus()
</span><span class="cx"> {
</span><del>- var hasChildren = false;
- for (var settings of this._folderizeSettingsMap.values()) {
- if (settings.countChildrenCallback()) {
</del><ins>+ let hasChildren = false;
+ for (let settings of this._folderizeSettingsMap.values()) {
+ if (settings.representedObject.items.size) {
</ins><span class="cx"> hasChildren = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -272,10 +270,10 @@
</span><span class="cx">
</span><span class="cx"> console.assert(this._folderSettingsKey !== "");
</span><span class="cx">
</span><del>- function createFolderTreeElement(type, displayName)
</del><ins>+ function createFolderTreeElement(settings)
</ins><span class="cx"> {
</span><del>- let folderTreeElement = new WebInspector.FolderTreeElement(displayName);
- let folderExpandedSetting = new WebInspector.Setting(type + "-folder-expanded-" + this._folderSettingsKey, false);
</del><ins>+ let folderTreeElement = new WebInspector.FolderTreeElement(settings.displayName, settings.representedObject);
+ let folderExpandedSetting = new WebInspector.Setting(settings.type + "-folder-expanded-" + this._folderSettingsKey, false);
</ins><span class="cx"> this._folderExpandedSettingMap.set(folderTreeElement, folderExpandedSetting);
</span><span class="cx">
</span><span class="cx"> if (folderExpandedSetting.value)
</span><span class="lines">@@ -296,7 +294,7 @@
</span><span class="cx"> if (folder)
</span><span class="cx"> return folder;
</span><span class="cx">
</span><del>- folder = createFolderTreeElement.call(this, settings.type, settings.folderDisplayName);
</del><ins>+ folder = createFolderTreeElement.call(this, settings);
</ins><span class="cx"> this._folderTypeMap.set(settings.type, folder);
</span><span class="cx"> return folder;
</span><span class="cx"> }
</span><span class="lines">@@ -313,8 +311,8 @@
</span><span class="cx">
</span><span class="cx"> _settingsForRepresentedObject(representedObject)
</span><span class="cx"> {
</span><del>- for (var settings of this._folderizeSettingsMap.values()) {
- if (settings.validateRepresentedObjectCallback(representedObject))
</del><ins>+ for (let settings of this._folderizeSettingsMap.values()) {
+ if (settings.representedObject.typeVerifier(representedObject))
</ins><span class="cx"> return settings;
</span><span class="cx"> }
</span><span class="cx"> return null;
</span><span class="lines">@@ -369,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> // Iterate over all the available child object types.
</span><span class="cx"> for (var settings of this._folderizeSettingsMap.values()) {
</span><del>- if (pushCategory(settings.countChildrenCallback()))
</del><ins>+ if (pushCategory(settings.representedObject.items.size))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js (208336 => 208337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2016-11-03 18:04:51 UTC (rev 208336)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2016-11-03 18:42:12 UTC (rev 208337)
</span><span class="lines">@@ -49,46 +49,15 @@
</span><span class="cx"> this.shouldRefreshChildren = true;
</span><span class="cx"> this.folderSettingsKey = this._frame.url.hash;
</span><span class="cx">
</span><del>- this.registerFolderizeSettings("frames", WebInspector.UIString("Frames"),
- (representedObject) => representedObject instanceof WebInspector.Frame,
- () => this.frame.childFrameCollection.items.size,
- WebInspector.FrameTreeElement
- );
</del><ins>+ this.registerFolderizeSettings("frames", WebInspector.UIString("Frames"), this._frame.childFrameCollection, WebInspector.FrameTreeElement);
+ this.registerFolderizeSettings("flows", WebInspector.UIString("Flows"), this._frame.domTree.contentFlowCollection, WebInspector.ContentFlowTreeElement);
+ this.registerFolderizeSettings("extra-scripts", WebInspector.UIString("Extra Scripts"), this._frame.extraScriptCollection, WebInspector.ScriptTreeElement);
</ins><span class="cx">
</span><del>- this.registerFolderizeSettings("flows", WebInspector.UIString("Flows"),
- (representedObject) => representedObject instanceof WebInspector.ContentFlow,
- () => this.frame.domTree.contentFlowCollection.items.size,
- WebInspector.ContentFlowTreeElement
- );
-
- this.registerFolderizeSettings("extra-scripts", WebInspector.UIString("Extra Scripts"),
- (representedObject) => representedObject instanceof WebInspector.Script && representedObject.dynamicallyAddedScriptElement,
- () => this.frame.extraScriptCollection.items.size,
- WebInspector.ScriptTreeElement
- );
-
- function makeValidateCallback(resourceType) {
- return function(representedObject) {
- return representedObject instanceof WebInspector.Resource && representedObject.type === resourceType;
- };
</del><ins>+ for (let [key, value] of Object.entries(WebInspector.Resource.Type)) {
+ let folderName = WebInspector.Resource.displayNameForType(value, true);
+ this.registerFolderizeSettings(key, folderName, this._frame.resourceCollectionForType(value), WebInspector.ResourceTreeElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function makeChildCountCallback(frame, resourceType) {
- return function() {
- return frame.resourceCollectionForType(resourceType).items.size;
- };
- }
-
- for (var key in WebInspector.Resource.Type) {
- var value = WebInspector.Resource.Type[key];
- var folderName = WebInspector.Resource.displayNameForType(value, true);
- this.registerFolderizeSettings(key, folderName,
- makeValidateCallback(value),
- makeChildCountCallback(this.frame, value),
- WebInspector.ResourceTreeElement
- );
- }
-
</del><span class="cx"> this.updateParentStatus();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (208336 => 208337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2016-11-03 18:04:51 UTC (rev 208336)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2016-11-03 18:42:12 UTC (rev 208337)
</span><span class="lines">@@ -171,8 +171,10 @@
</span><span class="cx"> // window.eval() or browser features like Auto Fill and Reader. They are not normally added to the sidebar, but since
</span><span class="cx"> // we have a ScriptContentView asking for the tree element we will make a ScriptTreeElement on demand and add it.
</span><span class="cx">
</span><del>- if (!this._anonymousScriptsFolderTreeElement)
- this._anonymousScriptsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Anonymous Scripts"));
</del><ins>+ if (!this._anonymousScriptsFolderTreeElement) {
+ let collection = new WebInspector.Collection(WebInspector.Collection.TypeVerifier.Script);
+ this._anonymousScriptsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Anonymous Scripts"), collection);
+ }
</ins><span class="cx">
</span><span class="cx"> if (!this._anonymousScriptsFolderTreeElement.parent) {
</span><span class="cx"> var index = insertionIndexForObjectInListSortedByFunction(this._anonymousScriptsFolderTreeElement, this.contentTreeOutline.children, this._compareTreeElements);
</span><span class="lines">@@ -179,6 +181,8 @@
</span><span class="cx"> this.contentTreeOutline.insertChild(this._anonymousScriptsFolderTreeElement, index);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this._anonymousScriptsFolderTreeElement.representedObject.add(representedObject);
+
</ins><span class="cx"> var scriptTreeElement = new WebInspector.ScriptTreeElement(representedObject);
</span><span class="cx"> this._anonymousScriptsFolderTreeElement.appendChild(scriptTreeElement);
</span><span class="cx">
</span><span class="lines">@@ -293,22 +297,31 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var insertIntoTopLevel = false;
</del><ins>+ let insertIntoTopLevel = false;
+ let parentFolderTreeElement = null;
</ins><span class="cx">
</span><span class="cx"> if (script.injected) {
</span><del>- if (!this._extensionScriptsFolderTreeElement)
- this._extensionScriptsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Extension Scripts"));
- var parentFolderTreeElement = this._extensionScriptsFolderTreeElement;
</del><ins>+ if (!this._extensionScriptsFolderTreeElement) {
+ let collection = new WebInspector.Collection(WebInspector.Collection.TypeVerifier.Script);
+ this._extensionScriptsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Extension Scripts"), collection);
+ }
+
+ parentFolderTreeElement = this._extensionScriptsFolderTreeElement;
</ins><span class="cx"> } else {
</span><span class="cx"> if (WebInspector.debuggableType === WebInspector.DebuggableType.JavaScript && !WebInspector.hasExtraDomains)
</span><span class="cx"> insertIntoTopLevel = true;
</span><span class="cx"> else {
</span><del>- if (!this._extraScriptsFolderTreeElement)
- this._extraScriptsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Extra Scripts"));
- var parentFolderTreeElement = this._extraScriptsFolderTreeElement;
</del><ins>+ if (!this._extraScriptsFolderTreeElement) {
+ let collection = new WebInspector.Collection(WebInspector.Collection.TypeVerifier.Script);
+ this._extraScriptsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Extra Scripts"), collection);
+ }
+
+ parentFolderTreeElement = this._extraScriptsFolderTreeElement;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ parentFolderTreeElement.representedObject.add(script);
+
</ins><span class="cx"> var scriptTreeElement = new WebInspector.ScriptTreeElement(script);
</span><span class="cx">
</span><span class="cx"> if (insertIntoTopLevel) {
</span><span class="lines">@@ -346,6 +359,8 @@
</span><span class="cx"> if (this._extensionScriptsFolderTreeElement) {
</span><span class="cx"> if (this._extensionScriptsFolderTreeElement.parent)
</span><span class="cx"> this._extensionScriptsFolderTreeElement.parent.removeChild(this._extensionScriptsFolderTreeElement, suppressOnDeselect, suppressSelectSibling);
</span><ins>+
+ this._extensionScriptsFolderTreeElement.representedObject.clear();
</ins><span class="cx"> this._extensionScriptsFolderTreeElement = null;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -352,6 +367,8 @@
</span><span class="cx"> if (this._extraScriptsFolderTreeElement) {
</span><span class="cx"> if (this._extraScriptsFolderTreeElement.parent)
</span><span class="cx"> this._extraScriptsFolderTreeElement.parent.removeChild(this._extraScriptsFolderTreeElement, suppressOnDeselect, suppressSelectSibling);
</span><ins>+
+ this._extraScriptsFolderTreeElement.representedObject.clear();
</ins><span class="cx"> this._extraScriptsFolderTreeElement = null;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -358,6 +375,8 @@
</span><span class="cx"> if (this._anonymousScriptsFolderTreeElement) {
</span><span class="cx"> if (this._anonymousScriptsFolderTreeElement.parent)
</span><span class="cx"> this._anonymousScriptsFolderTreeElement.parent.removeChild(this._anonymousScriptsFolderTreeElement, suppressOnDeselect, suppressSelectSibling);
</span><ins>+
+ this._anonymousScriptsFolderTreeElement.representedObject.clear();
</ins><span class="cx"> this._anonymousScriptsFolderTreeElement = null;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>