Attachment 339575 Details for Bug 185187 – Patch

[patch] Patch

bug-185187-20180504114038.patch (text/plain), 57.43 KB, created by Devin Rousso on 2018-05-04 11:40:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-05-04 11:40:39 PDT

Size: 57.43 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 475f11d135abd9c4ad227e1822121292bfaacfd1..6c45f566eae0b5375483b9aec898ec9b691186f9 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,67 @@
>+2018-05-04  Devin Rousso  <webkit@devinrousso.com>
>+
>+        Web Inspector: simplify the WI.Collection interface
>+        https://bugs.webkit.org/show_bug.cgi?id=185187
>+
>+        Reviewed by Brian Burg.
>+
>+        * UserInterface/Models/Collection.js:
>+        (WI.Collection.prototype.get size): Added.
>+        (WI.Collection.prototype.has): Added.
>+        (WI.Collection.prototype.toJSON):
>+        (WI.Collection.prototype.[Symbol.iterator]): Added.
>+        (WI.Collection.prototype.get items): Deleted.
>+        (WI.Collection.prototype.toArray): Deleted.
>+
>+        * UserInterface/Controllers/CanvasManager.js:
>+        (WI.CanvasManager.prototype._removeCanvas):
>+        * UserInterface/Controllers/DOMDebuggerManager.js:
>+        (WebInspector.DOMDebuggerManager.prototype.get domBreakpoints):
>+        * UserInterface/Models/Frame.js:
>+        (WI.Frame.prototype.removeAllChildFrames):
>+        (WI.Frame.prototype.resourceForURL):
>+        (WI.Frame.prototype.removeAllResources):
>+        * UserInterface/Models/Script.js:
>+        (WI.Script):
>+        * UserInterface/Views/CanvasContentView.js:
>+        (WI.CanvasContentView.prototype.initialLayout):
>+        * UserInterface/Views/CanvasOverviewContentView.js:
>+        (WI.CanvasOverviewContentView.prototype._updateNavigationItems):
>+        * UserInterface/Views/CanvasSidebarPanel.js:
>+        (WI.CanvasSidebarPanel.prototype._recordingRemoved):
>+        (WI.CanvasSidebarPanel.prototype._canvasChanged):
>+        (WI.CanvasSidebarPanel.prototype._updateRecordingScopeBar):
>+        * UserInterface/Views/CanvasTabContentView.js:
>+        (WI.CanvasTabContentView.prototype.attached):
>+        (WI.CanvasTabContentView.prototype._addCanvas):
>+        (WI.CanvasTabContentView.prototype._removeCanvas):
>+        * UserInterface/Views/CanvasTreeElement.js:
>+        (WI.CanvasTreeElement.prototype.onpopulate):
>+        * UserInterface/Views/CollectionContentView.js:
>+        (WI.CollectionContentView.prototype.initialLayout):
>+        (WI.CollectionContentView.prototype.attached):
>+        * UserInterface/Views/CookieStorageContentView.js:
>+        (WI.CookieStorageContentView.prototype._filterCookies):
>+        * UserInterface/Views/DebuggerSidebarPanel.js:
>+        (WI.DebuggerSidebarPanel.prototype._addResourcesRecursivelyForFrame):
>+        * UserInterface/Views/FolderizedTreeElement.js:
>+        (WI.FolderizedTreeElement.prototype.updateParentStatus):
>+        (WI.FolderizedTreeElement.prototype._shouldGroupIntoFolders):
>+        * UserInterface/Views/FrameTreeElement.js:
>+        (WI.FrameTreeElement.prototype.onpopulate):
>+        * UserInterface/Views/NavigationSidebarPanel.js:
>+        (WI.NavigationSidebarPanel.prototype.get contentTreeOutlines):
>+        * UserInterface/Views/NetworkTableContentView.js:
>+        (WI.NetworkTableContentView.prototype._populateWithInitialResourcesIfNeeded):
>+        * UserInterface/Views/OpenResourceDialog.js:
>+        (WI.OpenResourceDialog.prototype._addResourcesForFrame):
>+        (WI.OpenResourceDialog.prototype._addResourcesForTarget):
>+        * UserInterface/Views/TreeOutlineGroup.js:
>+        (WI.TreeOutlineGroup.prototype.get selectedTreeElement):
>+        (WI.TreeOutlineGroup.prototype._removeConflictingTreeSelections):
>+        * UserInterface/Views/WorkerTreeElement.js:
>+        (WI.WorkerTreeElement.prototype.onpopulate):
>+
> 2018-05-01  Devin Rousso  <webkit@devinrousso.com>
> 
>         Web Inspector: Canvas tab: determine hasVisibleEffect for all actions immediately after recording is added
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js b/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js
>index 6f41245e16307035a2cf9cd2259068bf6813e08f..5b4b4f9d787e8940c81b68c8ffbbaf317a4ee664 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js
>@@ -268,7 +268,7 @@ WI.CanvasManager = class CanvasManager extends WI.Object
> 
>     _removeCanvas(canvas)
>     {
>-        for (let program of canvas.shaderProgramCollection.items) {
>+        for (let program of canvas.shaderProgramCollection) {
>             this._shaderProgramIdentifierMap.delete(program.identifier);
>             this._dispatchShaderProgramRemoved(program);
>         }
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js
>index 068b1993e1f86fc31d75f23405ad79e7b1467b9d..000a3dd9a92c0117bb590823d687ead6b438a053 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js
>@@ -96,7 +96,7 @@ WI.DOMDebuggerManager = class DOMDebuggerManager extends WI.Object
>                     resolvedBreakpoints = resolvedBreakpoints.concat(breakpoints);
>             }
> 
>-            frames = frames.concat(frame.childFrameCollection.toArray());
>+            frames.push(...frame.childFrameCollection);
>         }
> 
>         return resolvedBreakpoints;
>diff --git a/Source/WebInspectorUI/UserInterface/Models/Collection.js b/Source/WebInspectorUI/UserInterface/Models/Collection.js
>index 4333984ffe8d148e18b661e9dd821b05940e08af..8bd3565b9213ec85ec8c34e3150a844392c00b64 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/Collection.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/Collection.js
>@@ -37,7 +37,10 @@ WI.Collection = class Collection extends WI.Object
> 
>     // Public
> 
>-    get items() { return this._items; }
>+    get size()
>+    {
>+        return this._items.size;
>+    }
> 
>     get displayName()
>     {
>@@ -74,6 +77,11 @@ WI.Collection = class Collection extends WI.Object
>         this.dispatchEventToListeners(WI.Collection.Event.ItemRemoved, {item});
>     }
> 
>+    has(...args)
>+    {
>+        return this._items.has(...args);
>+    }
>+
>     clear()
>     {
>         let items = new Set(this._items);
>@@ -86,14 +94,14 @@ WI.Collection = class Collection extends WI.Object
>             this.dispatchEventToListeners(WI.Collection.Event.ItemRemoved, {item});
>     }
> 
>-    toArray()
>+    toJSON()
>     {
>-        return Array.from(this._items);
>+        return Array.from(this);
>     }
> 
>-    toJSON()
>+    [Symbol.iterator]()
>     {
>-        return this.toArray();
>+        return this._items[Symbol.iterator]();
>     }
> 
>      // Protected
>diff --git a/Source/WebInspectorUI/UserInterface/Models/Frame.js b/Source/WebInspectorUI/UserInterface/Models/Frame.js
>index 4b21e4e5ee4355b6713bda5802f39c983b399cc0..08bf0cfcbab94689c747a7bd0e5883e713252549 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/Frame.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/Frame.js
>@@ -341,7 +341,7 @@ WI.Frame = class Frame extends WI.Object
>     {
>         this._detachFromParentFrame();
> 
>-        for (let childFrame of this._childFrameCollection.items)
>+        for (let childFrame of this._childFrameCollection)
>             childFrame.removeAllChildFrames();
> 
>         this._childFrameCollection.clear();
>@@ -357,7 +357,7 @@ WI.Frame = class Frame extends WI.Object
>             return resource;
> 
>         // Check the main resources of the child frames for the requested URL.
>-        for (let childFrame of this._childFrameCollection.items) {
>+        for (let childFrame of this._childFrameCollection) {
>             resource = childFrame.mainResource;
>             if (resource.url === url)
>                 return resource;
>@@ -367,7 +367,7 @@ WI.Frame = class Frame extends WI.Object
>             return null;
> 
>         // Recursively search resources of child frames.
>-        for (let childFrame of this._childFrameCollection.items) {
>+        for (let childFrame of this._childFrameCollection) {
>             resource = childFrame.resourceForURL(url, true);
>             if (resource)
>                 return resource;
>@@ -419,11 +419,10 @@ WI.Frame = class Frame extends WI.Object
>     {
>         // This does not remove provisional resources, use clearProvisionalLoad for that.
> 
>-        let resources = this._resourceCollection.items;
>-        if (!resources.size)
>+        if (!this._resourceCollection.size)
>             return;
> 
>-        for (let resource of resources)
>+        for (let resource of this._resourceCollection)
>             this._disassociateWithResource(resource);
> 
>         this._resourceCollection.clear();
>diff --git a/Source/WebInspectorUI/UserInterface/Models/Script.js b/Source/WebInspectorUI/UserInterface/Models/Script.js
>index b1910e8661c40aec1f817a90520d53a566d4f65c..04ef0688c72f51603a4ee6fd5ef3b66be8d6a9bb 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/Script.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/Script.js
>@@ -55,7 +55,7 @@ WI.Script = class Script extends WI.SourceCode
>             this._resource = null;
>             this._dynamicallyAddedScriptElement = true;
>             documentResource.parentFrame.addExtraScript(this);
>-            this._dynamicallyAddedScriptElementNumber = documentResource.parentFrame.extraScriptCollection.items.size;
>+            this._dynamicallyAddedScriptElementNumber = documentResource.parentFrame.extraScriptCollection.size;
>         } else if (this._resource)
>             this._resource.associateWithScript(this);
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js b/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js
>index 2fb58f0af498293181b8ec441b09067b06501a71..ef655b28ed7a2579ad63d0a95d5360305d3935b2 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js
>@@ -135,7 +135,7 @@ WI.CanvasContentView = class CanvasContentView extends WI.ContentView
>         this._recordingSelectElement = this._recordingSelectContainer.appendChild(document.createElement("select"));
>         this._recordingSelectElement.addEventListener("change", this._handleRecordingSelectElementChange.bind(this));
> 
>-        for (let recording of this.representedObject.recordingCollection.items)
>+        for (let recording of this.representedObject.recordingCollection)
>             this._addRecording(recording);
> 
>         let flexibleSpaceElement = footer.appendChild(document.createElement("div"));
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js b/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
>index fbd577e7e59429dd984e3292fdfbf954f5d66a31..b3300b1a835c033dfcba4085f8bcbc16b5a54f7f 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
>@@ -121,7 +121,7 @@ WI.CanvasOverviewContentView = class CanvasOverviewContentView extends WI.Collec
> 
>     _updateNavigationItems()
>     {
>-        let hasItems = !!this.representedObject.items.size;
>+        let hasItems = !!this.representedObject.size;
>         this._refreshButtonNavigationItem.enabled = hasItems;
>         this._showGridButtonNavigationItem.enabled = hasItems;
>     }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
>index 67fc08d2bd17127d9d05a26a63dbd64ef11c412b..f2398868d974a19610494ee7d954a4bed4c716bc 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
>@@ -213,7 +213,7 @@ WI.CanvasSidebarPanel = class CanvasSidebarPanel extends WI.NavigationSidebarPan
>     {
>         let recording = event.data.item;
>         if (recording === this.recording)
>-            this.recording = this._canvas ? this._canvas.recordingCollection.toArray().lastValue : null;
>+            this.recording = this._canvas ? Array.from(this._canvas.recordingCollection).lastValue : null;
> 
>         this._updateRecordingScopeBar();
>     }
>@@ -317,8 +317,8 @@ WI.CanvasSidebarPanel = class CanvasSidebarPanel extends WI.NavigationSidebarPan
>             this._recordButtonNavigationItem.enabled = true;
> 
>         let defaultSelectedRecording = null;
>-        if (this._canvas.recordingCollection.items.size)
>-            defaultSelectedRecording = this._canvas.recordingCollection.toArray().lastValue;
>+        if (this._canvas.recordingCollection.size)
>+            defaultSelectedRecording = Array.from(this._canvas.recordingCollection).lastValue;
> 
>         this.recording = defaultSelectedRecording;
>     }
>@@ -415,7 +415,7 @@ WI.CanvasSidebarPanel = class CanvasSidebarPanel extends WI.NavigationSidebarPan
> 
>         let scopeBarItems = [];
>         let selectedScopeBarItem = null;
>-        for (let recording of this._canvas.recordingCollection.items) {
>+        for (let recording of this._canvas.recordingCollection) {
>             let scopeBarItem = new WI.ScopeBarItem(recording.displayName, recording.displayName);
>             if (recording === this._recording)
>                 selectedScopeBarItem = scopeBarItem;
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js
>index aadb5aeb73987540ec1b2570367021e2c5ec62e9..cc88b8b5fcc63e2548869d9720c33bb9a05fbcfd 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js
>@@ -127,15 +127,15 @@ WI.CanvasTabContentView = class CanvasTabContentView extends WI.ContentBrowserTa
>         WI.canvasManager.addEventListener(WI.CanvasManager.Event.RecordingImported, this._recordingImportedOrStopped, this);
>         WI.canvasManager.addEventListener(WI.CanvasManager.Event.RecordingStopped, this._recordingImportedOrStopped, this);
> 
>-        let canvases = new Set(Array.from(this._canvasCollection.items).concat(WI.canvasManager.canvases));
>+        let canvases = new Set([...this._canvasCollection, ...WI.canvasManager.canvases]);
> 
>-        for (let canvas of this._canvasCollection.items) {
>+        for (let canvas of this._canvasCollection) {
>             if (!canvases.has(canvas))
>                 this._removeCanvas(canvas);
>         }
> 
>         for (let canvas of canvases) {
>-            if (!this._canvasCollection.items.has(canvas))
>+            if (!this._canvasCollection.has(canvas))
>                 this._addCanvas(canvas);
>         }
>     }
>@@ -155,7 +155,7 @@ WI.CanvasTabContentView = class CanvasTabContentView extends WI.ContentBrowserTa
>         this._overviewTreeElement.appendChild(new WI.CanvasTreeElement(canvas));
>         this._canvasCollection.add(canvas);
> 
>-        for (let recording of canvas.recordingCollection.items)
>+        for (let recording of canvas.recordingCollection)
>             this._recordingAdded(recording, {suppressShowRecording: true});
>     }
> 
>@@ -169,7 +169,7 @@ WI.CanvasTabContentView = class CanvasTabContentView extends WI.ContentBrowserTa
>         this._canvasCollection.remove(canvas);
> 
>         let currentContentView = this.contentBrowser.currentContentView;
>-        if (currentContentView instanceof WI.RecordingContentView && canvas.recordingCollection.items.has(currentContentView.representedObject))
>+        if (currentContentView instanceof WI.RecordingContentView && canvas.recordingCollection.has(currentContentView.representedObject))
>             this.contentBrowser.updateHierarchicalPathForCurrentContentView();
>     }
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/CanvasTreeElement.js
>index 6631cda62b93e853cfd36f25a420a942ec3e9887..510126bbe3ee6e37c3be71397a34d6c02abd5f79 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasTreeElement.js
>@@ -75,11 +75,11 @@ WI.CanvasTreeElement = class CanvasTreeElement extends WI.FolderizedTreeElement
> 
>         this.removeChildren();
> 
>-        for (let program of this.representedObject.shaderProgramCollection.items)
>+        for (let program of this.representedObject.shaderProgramCollection)
>             this.addChildForRepresentedObject(program);
> 
>         if (this._showRecordings) {
>-            for (let recording of this.representedObject.recordingCollection.items)
>+            for (let recording of this.representedObject.recordingCollection)
>                 this.addChildForRepresentedObject(recording);
>         }
>     }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js b/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js
>index 2f4d1277d6eda13dfe1a943ca8e795dee43c439e..a971659f88965ce3ac19fc564dea71cc6228352a 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js
>@@ -186,8 +186,7 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
> 
>     initialLayout()
>     {
>-        let items = this.representedObject.items;
>-        if (!items.size || !this._contentViewConstructor) {
>+        if (!this.representedObject.size || !this._contentViewConstructor) {
>             this._showContentPlaceholder();
>             return;
>         }
>@@ -201,7 +200,7 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
>         this.representedObject.addEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
> 
>         for (let item of this._contentViewMap.keys()) {
>-            if (this.representedObject.items.has(item))
>+            if (this.representedObject.has(item))
>                 continue;
> 
>             this.removeContentViewForItem(item);
>@@ -209,7 +208,7 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
>                 this._selectItem(null);
>         }
> 
>-        for (let item of this.representedObject.items) {
>+        for (let item of this.representedObject) {
>             if (!this._contentViewMap.has(item))
>                 this.addContentViewForItem(item);
>         }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js b/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js
>index a2c9c3bfa5eb640476ac3f8b80d33fefc8ff9dc9..337540477a5323cf08dd5d693fcd40f493fb673b 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js
>@@ -158,8 +158,7 @@ WI.CookieStorageContentView = class CookieStorageContentView extends WI.ContentV
>         let allResources = [];
>         for (let frame of WI.frameResourceManager.frames) {
>             // The main resource isn't in the list of resources, so add it as a candidate.
>-            allResources.push(frame.mainResource);
>-            allResources = allResources.concat(frame.resourceCollection.toArray());
>+            allResources.push(frame.mainResource, ...frame.resourceCollection);
>         }
> 
>         let resourcesForDomain = allResources.filter(resourceMatchesStorageDomain);
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>index 1ffec145b4ef01c53cc7590a637570908a387e66..5917b0562bda9b36f15b931012ddfd77820687b6 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>@@ -495,10 +495,10 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba
>     {
>         this._addResource(frame.mainResource);
> 
>-        for (let resource of frame.resourceCollection.items)
>+        for (let resource of frame.resourceCollection)
>             this._addResource(resource);
> 
>-        for (let childFrame of frame.childFrameCollection.items)
>+        for (let childFrame of frame.childFrameCollection)
>             this._addResourcesRecursivelyForFrame(childFrame);
>     }
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js
>index 785bd756f0d846967f5461a62f16d93f4539c7d4..8eea5ded273d8c479c444106c326f833fd5de8e3 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js
>@@ -148,7 +148,7 @@ WI.FolderizedTreeElement = class FolderizedTreeElement extends WI.GeneralTreeEle
>     {
>         let hasChildren = false;
>         for (let settings of this._folderizeSettingsMap.values()) {
>-            if (settings.representedObject.items.size) {
>+            if (settings.representedObject.size) {
>                 hasChildren = true;
>                 break;
>             }
>@@ -380,7 +380,7 @@ WI.FolderizedTreeElement = class FolderizedTreeElement extends WI.GeneralTreeEle
> 
>         // Iterate over all the available child object types.
>         for (var settings of this._folderizeSettingsMap.values()) {
>-            if (pushCategory(settings.representedObject.items.size))
>+            if (pushCategory(settings.representedObject.size))
>                 return true;
>         }
>         return false;
>diff --git a/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js
>index c73eab993b7a5680fd4afc8b628bd914c93788f9..640b8adf45a03a12404249915f629083cf3133bc 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js
>@@ -160,10 +160,10 @@ WI.FrameTreeElement = class FrameTreeElement extends WI.ResourceTreeElement
>         this.updateParentStatus();
>         this.prepareToPopulate();
> 
>-        for (let frame of this._frame.childFrameCollection.items)
>+        for (let frame of this._frame.childFrameCollection)
>             this.addChildForRepresentedObject(frame);
> 
>-        for (let resource of this._frame.resourceCollection.items)
>+        for (let resource of this._frame.resourceCollection)
>             this.addChildForRepresentedObject(resource);
> 
>         var sourceMaps = this.resource && this.resource.sourceMaps;
>@@ -173,7 +173,7 @@ WI.FrameTreeElement = class FrameTreeElement extends WI.ResourceTreeElement
>                 this.addChildForRepresentedObject(sourceMap.resources[j]);
>         }
> 
>-        for (let extraScript of this._frame.extraScriptCollection.items) {
>+        for (let extraScript of this._frame.extraScriptCollection) {
>             if (extraScript.sourceURL || extraScript.sourceMappingURL)
>                 this.addChildForRepresentedObject(extraScript);
>         }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js
>index 6628bb824f34a109d90bc6267c5bce0b71c0b69f..586730806982b17884a3e0247c272b8e35c3562d 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js
>@@ -95,7 +95,7 @@ WI.NavigationSidebarPanel = class NavigationSidebarPanel extends WI.SidebarPanel
> 
>     get contentTreeOutlines()
>     {
>-        return this._contentTreeOutlineGroup.items;
>+        return Array.from(this._contentTreeOutlineGroup);
>     }
> 
>     get currentRepresentedObject()
>diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
>index ec52b28ea60a9730af4774f5c05f76f91e833592..a487cc628b2ba1db17461c6ba820650fd7710514 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
>@@ -881,17 +881,17 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie
>             else if (frame.mainResource)
>                 this._pendingInsertions.push(frame.mainResource);
> 
>-            for (let resource of frame.resourceCollection.items)
>+            for (let resource of frame.resourceCollection)
>                 this._pendingInsertions.push(resource);
> 
>-            for (let childFrame of frame.childFrameCollection.items)
>+            for (let childFrame of frame.childFrameCollection)
>                 populateResourcesForFrame(childFrame);
>         };
> 
>         let populateResourcesForTarget = (target) => {
>             if (target.mainResource instanceof WI.Resource)
>                 this._pendingInsertions.push(target.mainResource);
>-            for (let resource of target.resourceCollection.items)
>+            for (let resource of target.resourceCollection)
>                 this._pendingInsertions.push(resource);
>         };
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js b/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js
>index e7aaed0e47a0b273c4fa2dbd5b7067018791b812..f638f8e0c0f2cbe16379102226979818ad0babba 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js
>@@ -285,11 +285,11 @@ WI.OpenResourceDialog = class OpenResourceDialog extends WI.Dialog
>         let frames = [frame];
>         while (frames.length) {
>             let currentFrame = frames.shift();
>-            let resources = [currentFrame.mainResource].concat(Array.from(currentFrame.resourceCollection.items));
>-            for (let resource of resources)
>+            this._addResource(currentFrame.mainResource, suppressFilterUpdate);
>+            for (let resource of currentFrame.resourceCollection)
>                 this._addResource(resource, suppressFilterUpdate);
> 
>-            frames = frames.concat(currentFrame.childFrameCollection.toArray());
>+            frames.push(...currentFrame.childFrameCollection);
>         }
>     }
> 
>@@ -299,7 +299,7 @@ WI.OpenResourceDialog = class OpenResourceDialog extends WI.Dialog
> 
>         this._addResource(target.mainResource);
> 
>-        for (let resource of target.resourceCollection.items)
>+        for (let resource of target.resourceCollection)
>             this._addResource(resource, suppressFilterUpdate);
> 
>         let targetData = WI.debuggerManager.dataForTarget(target);
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TreeOutlineGroup.js b/Source/WebInspectorUI/UserInterface/Views/TreeOutlineGroup.js
>index b2a806216ff6ce4ebd46a3e76a7b8789b60a2028..12c16159487ad4802241663af239d43beaa1a026 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TreeOutlineGroup.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TreeOutlineGroup.js
>@@ -41,7 +41,7 @@ WI.TreeOutlineGroup = class TreeOutlineGroup extends WI.Collection
> 
>     get selectedTreeElement()
>     {
>-        for (let treeOutline of this.items) {
>+        for (let treeOutline of this) {
>             if (treeOutline.selectedTreeElement)
>                 return treeOutline.selectedTreeElement;
>         }
>@@ -83,7 +83,7 @@ WI.TreeOutlineGroup = class TreeOutlineGroup extends WI.Collection
>         let selectedTreeOutline = treeElement.treeOutline;
>         console.assert(selectedTreeOutline, "Should have a parent tree outline.");
> 
>-        for (let treeOutline of this.items) {
>+        for (let treeOutline of this) {
>             if (selectedTreeOutline === treeOutline)
>                 continue;
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/WorkerTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/WorkerTreeElement.js
>index 2189a14a7975968114efc85dfef88ca616efd22f..6e8dd0e8cd7de0d11829c245dfa43fef81d309a7 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/WorkerTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/WorkerTreeElement.js
>@@ -87,10 +87,10 @@ WI.WorkerTreeElement = class WorkerTreeElement extends WI.ScriptTreeElement
>         this.removeChildren();
>         this.prepareToPopulate();
> 
>-        for (let resource of this._target.resourceCollection.items)
>+        for (let resource of this._target.resourceCollection)
>             this.addChildForRepresentedObject(resource);
> 
>-        for (let script of this._target.extraScriptCollection.items)
>+        for (let script of this._target.extraScriptCollection)
>             this.addChildForRepresentedObject(script);
> 
>         let sourceMaps = this._target.mainResource.sourceMaps;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 0daaf86597dbe0d4f383a9b973b4de7ef63bb511..f86198478d6a95e483fe19998bbfbfdf92654e0e 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,33 @@
>+2018-05-04  Devin Rousso  <webkit@devinrousso.com>
>+
>+        Web Inspector: simplify the WI.Collection interface
>+        https://bugs.webkit.org/show_bug.cgi?id=185187
>+
>+        Reviewed by Brian Burg.
>+
>+        * http/tests/inspector/dom/cross-domain-inspected-node-access.html:
>+        * http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html:
>+        * http/tests/inspector/network/har/har-page.html:
>+        * http/tests/inspector/network/har/har-page-expected.txt:
>+        * http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html:
>+        * http/tests/inspector/network/resource-response-source-memory-cache.html:
>+        * http/tests/inspector/network/resource-sizes-memory-cache.html:
>+        * http/tests/inspector/network/set-resource-caching-disabled-memory-cache.html:
>+        * http/tests/inspector/worker/blob-script-with-cross-domain-imported-scripts.html:
>+        * http/tests/websocket/tests/hybi/inspector/before-load.html:
>+        * inspector/canvas/resources/recording-utilities.js:
>+        * inspector/css/manager-preferredInspectorStyleSheetForFrame.html:
>+        * inspector/debugger/resources/log-pause-location.js:
>+        (TestPage.registerInitializer.window.findScript):
>+        * inspector/dom/highlightFrame.html:
>+        * inspector/dom/highlightNode.html:
>+        * inspector/dom/highlightNodeList.html:
>+        * inspector/dom/highlightSelector.html:
>+        * inspector/model/frame-extra-scripts.html:
>+        * inspector/page/empty-or-missing-resources.html:
>+        * inspector/unit-tests/resource-collection.html:
>+        * inspector/worker/resources-in-worker.html:
>+
> 2018-05-03  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Revert the unitended changes in r231329.
>diff --git a/LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access.html b/LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access.html
>index 74a58f9ce0c1cf43bf89092b568b33f4e540f1fb..b499abcbe2bdbe3b01f6f9f133fdcdd4bc991019 100644
>--- a/LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access.html
>+++ b/LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access.html
>@@ -8,7 +8,7 @@ function test()
>     let suite = InspectorTest.createAsyncSuite("CommandLineAPI.$0.cross-frame");
> 
>     let mainFrame = WI.frameResourceManager.mainFrame;
>-    let childFrames = mainFrame.childFrameCollection.toArray();
>+    let childFrames = Array.from(mainFrame.childFrameCollection);
>     InspectorTest.expectEqual(childFrames.length, 1, "Page should have a subframe.");
> 
>     let nodeInMainFrameId;
>diff --git a/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html b/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html
>index 9ef1c6873c023381983b322514033783303f7e1e..a55046bbac586a03f86c5fd9d48731da344bf816 100644
>--- a/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html
>+++ b/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html
>@@ -30,13 +30,13 @@ function test()
>             InspectorTest.log("DOMTree instance count: " + instances.size);
> 
>             // Force creation of child DOM trees.
>-            let childrenLevel1 = mainFrame.childFrameCollection.toArray();
>+            let childrenLevel1 = Array.from(mainFrame.childFrameCollection);
>             childrenLevel1[0].domTree;
> 
>-            let childrenLevel2 = childrenLevel1[0].childFrameCollection.toArray();
>+            let childrenLevel2 = Array.from(childrenLevel1[0].childFrameCollection);
>             childrenLevel2[0].domTree;
> 
>-            let childrenLevel3 = childrenLevel2[0].childFrameCollection.toArray();
>+            let childrenLevel3 = Array.from(childrenLevel2[0].childFrameCollection);
>             childrenLevel3[0].domTree;
> 
>             instances = WI.domTreeManager.retainedObjectsWithPrototype(WI.DOMTree);
>diff --git a/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt b/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
>index 4e164eaf5076a7dcc675b5926e99d1410c45c19c..22292ac1600db28eb4b10f59360d1b32e92a5c31 100644
>--- a/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
>+++ b/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
>@@ -43,10 +43,10 @@ HAR Page Test.
>           "cookies": [],
>           "headers": "<filtered>",
>           "content": {
>-            "size": 3042,
>+            "size": "<filtered>",
>             "compression": 0,
>             "mimeType": "text/html",
>-            "text": "<filtered text (3042)>"
>+            "text": "<filtered>"
>           },
>           "redirectURL": "",
>           "headersSize": "<filtered>",
>@@ -84,10 +84,10 @@ HAR Page Test.
>           "cookies": [],
>           "headers": "<filtered>",
>           "content": {
>-            "size": 0,
>+            "size": "<filtered>",
>             "compression": 0,
>             "mimeType": "application/x-javascript",
>-            "text": "<filtered text (7039)>"
>+            "text": "<filtered>"
>           },
>           "redirectURL": "",
>           "headersSize": "<filtered>",
>diff --git a/LayoutTests/http/tests/inspector/network/har/har-page.html b/LayoutTests/http/tests/inspector/network/har/har-page.html
>index 3bb99370971e6d60f5cbda395ca77df044742cbe..37694792f0dd49a960af1711f57bd6b82e363194 100644
>--- a/LayoutTests/http/tests/inspector/network/har/har-page.html
>+++ b/LayoutTests/http/tests/inspector/network/har/har-page.html
>@@ -35,13 +35,19 @@ function test()
>         if (key.endsWith("DateTime"))
>             return "<filtered>";
> 
>+        // If any files are modified, we'd need to update the test without this filter.
>+        if (key == "size")
>+            return "<filtered>";
>+
>         // Size data may or may not be available, but could change based on headers.
>         if (key.endsWith("Size"))
>             return "<filtered>";
> 
>         // Reduce the file contents.
>-        if (key === "text")
>-            return "<filtered text (" + value.length + ")>";
>+        if (key === "text") {
>+            InspectorTest.assert(value.length > 0, "The file should have contents.");
>+            return "<filtered>";
>+        }
> 
>         // Since cache may or may not be used, timing data may be variable.
>         // NOTE: SSL should always be -1 for this test case.
>@@ -72,11 +78,7 @@ function test()
>             InspectorTest.reloadPage({ignoreCache: true});
>             await InspectorTest.awaitEvent("LoadComplete");
> 
>-            let resources = [];
>-            resources.push(WI.frameResourceManager.mainFrame.mainResource);
>-            for (let resource of WI.frameResourceManager.mainFrame.resourceCollection.items)
>-                resources.push(resource);
>-
>+            let resources = [WI.frameResourceManager.mainFrame.mainResource, ...WI.frameResourceManager.mainFrame.resourceCollection];
>             let har = await WI.HARBuilder.buildArchive(resources);
>             InspectorTest.json(har, HARJSONFilter);
>         }
>diff --git a/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html b/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html
>index b34d063dc843404e0fe1d2952f6e3ca1683048c2..d033e7fe5ae6ccec10a78162bc5845c9311c37f8 100644
>--- a/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html
>+++ b/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html
>@@ -18,7 +18,7 @@ function test()
>                 InspectorTest.reloadPage({ignoreCache, revalidateAllResources: true});
>                 InspectorTest.awaitEvent("LoadComplete").then((event) => {
>                     let resource = null;
>-                    for (let item of WI.frameResourceManager.mainFrame.resourceCollection.items) {
>+                    for (let item of WI.frameResourceManager.mainFrame.resourceCollection) {
>                         if (pattern.test(item.url)) {
>                             resource = item;
>                             break;
>diff --git a/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache.html b/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache.html
>index d4818e9b4c6a816a420c398f838b544359dde43b..88858a155495dd04e4adeaa008235daf9d73a7bb 100644
>--- a/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache.html
>+++ b/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache.html
>@@ -18,7 +18,7 @@ function test()
>                 InspectorTest.reloadPage({ignoreCache});
>                 InspectorTest.awaitEvent("LoadComplete").then((event) => {
>                     let resource = null;
>-                    for (let item of WI.frameResourceManager.mainFrame.resourceCollection.items) {
>+                    for (let item of WI.frameResourceManager.mainFrame.resourceCollection) {
>                         if (pattern.test(item.url)) {
>                             resource = item;
>                             break;
>diff --git a/LayoutTests/http/tests/inspector/network/resource-sizes-memory-cache.html b/LayoutTests/http/tests/inspector/network/resource-sizes-memory-cache.html
>index 9adb69b98d748547b9538eccf738b66265c2e88b..280103cca3d4a4216356a46fbda4f3df8489f5bf 100644
>--- a/LayoutTests/http/tests/inspector/network/resource-sizes-memory-cache.html
>+++ b/LayoutTests/http/tests/inspector/network/resource-sizes-memory-cache.html
>@@ -29,7 +29,7 @@ function test()
>             InspectorTest.reloadPage({ignoreCache, revalidateAllResources});
>             return InspectorTest.awaitEvent("LoadComplete").then((event) => {
>                 let resource = null;
>-                for (let item of WI.frameResourceManager.mainFrame.resourceCollection.items) {
>+                for (let item of WI.frameResourceManager.mainFrame.resourceCollection) {
>                     if (pattern.test(item.url)) {
>                         resource = item;
>                         break;
>diff --git a/LayoutTests/http/tests/inspector/network/set-resource-caching-disabled-memory-cache.html b/LayoutTests/http/tests/inspector/network/set-resource-caching-disabled-memory-cache.html
>index 363d88748e6b828ebfc75fe682b4689f05c4a1fa..2f54b1ace545bbc3bd1f2a40e7c6df6a89768e2e 100644
>--- a/LayoutTests/http/tests/inspector/network/set-resource-caching-disabled-memory-cache.html
>+++ b/LayoutTests/http/tests/inspector/network/set-resource-caching-disabled-memory-cache.html
>@@ -21,7 +21,7 @@ function test()
>                 InspectorTest.reloadPage({ignoreCache});
>                 InspectorTest.awaitEvent("LoadComplete").then((event) => {
>                     let resource = null;
>-                    for (let item of WI.frameResourceManager.mainFrame.resourceCollection.items) {
>+                    for (let item of WI.frameResourceManager.mainFrame.resourceCollection) {
>                         if (pattern.test(item.url)) {
>                             resource = item;
>                             break;
>diff --git a/LayoutTests/http/tests/inspector/worker/blob-script-with-cross-domain-imported-scripts.html b/LayoutTests/http/tests/inspector/worker/blob-script-with-cross-domain-imported-scripts.html
>index 595115ea50bfaf163fb855905316d7dcd14b1b87..0bef8335af2edcc48edbc7cb4e3ece6bb94ca5e2 100644
>--- a/LayoutTests/http/tests/inspector/worker/blob-script-with-cross-domain-imported-scripts.html
>+++ b/LayoutTests/http/tests/inspector/worker/blob-script-with-cross-domain-imported-scripts.html
>@@ -46,7 +46,7 @@ function test()
>     function dumpWorkerResources() {
>         InspectorTest.log("RESOURCES:");
>         let urls = [];
>-        for (let resource of workerTarget.resourceCollection.items)
>+        for (let resource of workerTarget.resourceCollection)
>             urls.push(sanitizeURL(resource.url));
>         dumpURLs(urls);
>     }
>diff --git a/LayoutTests/http/tests/websocket/tests/hybi/inspector/before-load.html b/LayoutTests/http/tests/websocket/tests/hybi/inspector/before-load.html
>index 11e0f58e2f729eeacc6be1e410d83e882dd89244..626284f86fa4384ae25c182ac5db1319f1100157 100644
>--- a/LayoutTests/http/tests/websocket/tests/hybi/inspector/before-load.html
>+++ b/LayoutTests/http/tests/websocket/tests/hybi/inspector/before-load.html
>@@ -46,9 +46,9 @@ function test()
>         test(resolve, reject) {
>             const url = "ws://127.0.0.1:8880/websocket/tests/hybi/inspector/echo";
>             let webSocketResources = WI.frameResourceManager.mainFrame.resourceCollectionForType(WI.Resource.Type.WebSocket);
>-            InspectorTest.expectEqual(webSocketResources.items.size, 1, "Should have 1 WebSocketResource");
>+            InspectorTest.expectEqual(webSocketResources.size, 1, "Should have 1 WebSocketResource");
> 
>-            let webSocketResource = webSocketResources.toArray()[0];
>+            let webSocketResource = Array.from(webSocketResources)[0];
>             if (!webSocketResource) {
>                 reject("Missing WebSocket resource.");
>                 return;
>diff --git a/LayoutTests/inspector/canvas/resources/recording-utilities.js b/LayoutTests/inspector/canvas/resources/recording-utilities.js
>index 4b35ce1c8e5c66f1053ea9d62e88b81e00cc2b52..b06223a3b7bbe57153af01653f26ab1b41127a69 100644
>--- a/LayoutTests/inspector/canvas/resources/recording-utilities.js
>+++ b/LayoutTests/inspector/canvas/resources/recording-utilities.js
>@@ -121,7 +121,7 @@ TestPage.registerInitializer(() => {
>             let recording = event.data.recording;
>             InspectorTest.assert(recording.source === canvas, "Recording should be of the given canvas.");
>             InspectorTest.assert(recording.source.contextType === type, `Recording should be of a canvas with type "${type}".`);
>-            InspectorTest.assert(recording.source.recordingCollection.items.has(recording), "Recording should be in the canvas' list of recordings.");
>+            InspectorTest.assert(recording.source.recordingCollection.has(recording), "Recording should be in the canvas' list of recordings.");
>             InspectorTest.assert(recording.frames.length === frameCount, `Recording should have ${frameCount} frames.`)
> 
>             return Promise.all(recording.actions.map((action) => action.swizzle(recording))).then(() => {
>diff --git a/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html b/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html
>index e2a41614151b1c50df18c3cac8519dafb3d4dffb..d1bfae0dd143206d8cda07b84617330b64186c40 100644
>--- a/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html
>+++ b/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html
>@@ -6,7 +6,7 @@
> function test()
> {
>     let mainFrame = WI.frameResourceManager.mainFrame;
>-    let childFrames = mainFrame.childFrameCollection.toArray();
>+    let childFrames = Array.from(mainFrame.childFrameCollection);
>     InspectorTest.expectEqual(childFrames.length, 1, "Page should have a subframe.");
> 
>     let suite = InspectorTest.createAsyncSuite("CSSManager.preferredInspectorStyleSheetForFrame");
>diff --git a/LayoutTests/inspector/debugger/resources/log-pause-location.js b/LayoutTests/inspector/debugger/resources/log-pause-location.js
>index 24abd4aa146f23280d3028437a41cac58530dc1f..3e1a5f5dbebec6bd97c3971ab82e72b49f873dde 100644
>--- a/LayoutTests/inspector/debugger/resources/log-pause-location.js
>+++ b/LayoutTests/inspector/debugger/resources/log-pause-location.js
>@@ -7,8 +7,7 @@ TestPage.registerInitializer(() => {
>     }
> 
>     window.findScript = function(regex) {
>-        let resources = WI.frameResourceManager.mainFrame.resourceCollection.items;
>-        for (let resource of resources) {
>+        for (let resource of WI.frameResourceManager.mainFrame.resourceCollection) {
>             if (regex.test(resource.url))
>                 return resource.scripts[0];
>         }
>diff --git a/LayoutTests/inspector/dom/highlightFrame.html b/LayoutTests/inspector/dom/highlightFrame.html
>index bd6bbc1bf576080417ba65dfba0158367c9de39d..6d7c0daf4a4d1f6b891e403e3556f05e4fb27158 100644
>--- a/LayoutTests/inspector/dom/highlightFrame.html
>+++ b/LayoutTests/inspector/dom/highlightFrame.html
>@@ -8,7 +8,7 @@ function test()
>     let suite = InspectorTest.createAsyncSuite("DOM.highlightFrame");
> 
>     let mainFrame = WI.frameResourceManager.mainFrame;
>-    let childFrames = mainFrame.childFrameCollection.toArray();
>+    let childFrames = Array.from(mainFrame.childFrameCollection);
>     InspectorTest.expectEqual(childFrames.length, 2, "Page should have subframes.");
> 
>     function getHighlight(callback) {
>diff --git a/LayoutTests/inspector/dom/highlightNode.html b/LayoutTests/inspector/dom/highlightNode.html
>index 52c4683cc19bf6cbb5566a40af60b123d8c49057..da5b5edb2bbfb02da9817ff6b948deef4df5c13b 100644
>--- a/LayoutTests/inspector/dom/highlightNode.html
>+++ b/LayoutTests/inspector/dom/highlightNode.html
>@@ -8,7 +8,7 @@ function test()
>     let suite = InspectorTest.createAsyncSuite("DOM.highlightNode");
> 
>     let mainFrame = WI.frameResourceManager.mainFrame;
>-    let childFrames = mainFrame.childFrameCollection.toArray();
>+    let childFrames = Array.from(mainFrame.childFrameCollection);
>     InspectorTest.expectEqual(childFrames.length, 1, "Page should have a subframe.");
> 
>     const highlightConfig = {
>diff --git a/LayoutTests/inspector/dom/highlightNodeList.html b/LayoutTests/inspector/dom/highlightNodeList.html
>index 90ce9c81cddc2fc51843b1d32fd479f95fddf411..47923e061254f67fddcf1efc5de97e4f75597a41 100644
>--- a/LayoutTests/inspector/dom/highlightNodeList.html
>+++ b/LayoutTests/inspector/dom/highlightNodeList.html
>@@ -8,7 +8,7 @@ function test()
>     let suite = InspectorTest.createAsyncSuite("DOM.highlightNodeList");
> 
>     let mainFrame = WI.frameResourceManager.mainFrame;
>-    let childFrames = mainFrame.childFrameCollection.toArray();
>+    let childFrames = Array.from(mainFrame.childFrameCollection);
>     InspectorTest.expectEqual(childFrames.length, 1, "Page should have a subframe.");
> 
>     const highlightConfig = {
>diff --git a/LayoutTests/inspector/dom/highlightSelector.html b/LayoutTests/inspector/dom/highlightSelector.html
>index bdf9a7c14c5681ce9edc831ad44b7c9689c602c6..63c59dd8df9730130986421f56211e1257fbbd2a 100644
>--- a/LayoutTests/inspector/dom/highlightSelector.html
>+++ b/LayoutTests/inspector/dom/highlightSelector.html
>@@ -8,7 +8,7 @@ function test()
>     let suite = InspectorTest.createAsyncSuite("DOM.highlightSelector");
> 
>     let mainFrame = WI.frameResourceManager.mainFrame;
>-    let childFrames = mainFrame.childFrameCollection.toArray();
>+    let childFrames = Array.from(mainFrame.childFrameCollection);
>     InspectorTest.expectEqual(childFrames.length, 1, "Page should have a subframe.");
> 
>     let mainFrameId = mainFrame.id;
>diff --git a/LayoutTests/inspector/model/frame-extra-scripts.html b/LayoutTests/inspector/model/frame-extra-scripts.html
>index 4e02484f30701a5fe91c583abbf27ef6904b7b88..86fe4921db54b8bdd2e7068f7d2a542a8dfbe4e3 100644
>--- a/LayoutTests/inspector/model/frame-extra-scripts.html
>+++ b/LayoutTests/inspector/model/frame-extra-scripts.html
>@@ -19,7 +19,7 @@ function test()
>         name: "FrameHasNoExtraScriptsYet",
>         description: "No extra scripts yet.",
>         test(resolve, reject) {
>-            InspectorTest.expectEqual(mainFrame.extraScriptCollection.items.size, 0, "Main frame should have no dynamic scripts.");
>+            InspectorTest.expectEqual(mainFrame.extraScriptCollection.size, 0, "Main frame should have no dynamic scripts.");
>             resolve();
>         }
>     });
>@@ -32,7 +32,7 @@ function test()
>             .then((event) => {
>                 InspectorTest.pass("ExtraScriptAdded event fired.");
>                 InspectorTest.expectThat(event.data.script.dynamicallyAddedScriptElement, "Script should identify as dynamic.");
>-                InspectorTest.expectEqual(mainFrame.extraScriptCollection.items.size, 1, "Main frame should have 1 dynamic script.");
>+                InspectorTest.expectEqual(mainFrame.extraScriptCollection.size, 1, "Main frame should have 1 dynamic script.");
>             })
>             .then(resolve, reject);
> 
>diff --git a/LayoutTests/inspector/page/empty-or-missing-resources.html b/LayoutTests/inspector/page/empty-or-missing-resources.html
>index a640dce685729c55f8c895d1b09260c4f86a7423..2e65c3ff0d577f2dea0272d34d797a7571b595ed 100644
>--- a/LayoutTests/inspector/page/empty-or-missing-resources.html
>+++ b/LayoutTests/inspector/page/empty-or-missing-resources.html
>@@ -15,7 +15,7 @@ function test()
>         name: "Page.getResourceTree.EmptyResources",
>         description: "Should not crash if there are empty or missing resources.",
>         async test(resolve, reject) {
>-            let resources = [...WI.frameResourceManager.mainFrame.resourceCollection.items];
>+            let resources = Array.from(WI.frameResourceManager.mainFrame.resourceCollection);
>             let resourceURLs = resources.map(x => x.url).filter(x => /(empty|missing)/.test(x)).sort();
>             for (let url of resourceURLs)
>                 InspectorTest.log(sanitizeURL(url));
>diff --git a/LayoutTests/inspector/unit-tests/resource-collection.html b/LayoutTests/inspector/unit-tests/resource-collection.html
>index e39aaa57fe4ec5a5ad36cc03c98f79ff5025e341..f989cefdbdc5131e9546cc44e729796d49d765b4 100644
>--- a/LayoutTests/inspector/unit-tests/resource-collection.html
>+++ b/LayoutTests/inspector/unit-tests/resource-collection.html
>@@ -12,8 +12,7 @@ function test()
>     }
> 
>     function logResourceNames(collection) {
>-        let items = Array.from(collection.items);
>-        InspectorTest.log(items.map((resource) => resource.displayName));
>+        InspectorTest.log(Array.from(collection).map((resource) => resource.displayName));
>     }
> 
>     suite.addTestCase({
>diff --git a/LayoutTests/inspector/worker/resources-in-worker.html b/LayoutTests/inspector/worker/resources-in-worker.html
>index c26ef924bd2df11234f83bb0a47130a17372ac96..b2c567fda2d0f97013d9dc630c05e2288da6b079 100644
>--- a/LayoutTests/inspector/worker/resources-in-worker.html
>+++ b/LayoutTests/inspector/worker/resources-in-worker.html
>@@ -41,9 +41,9 @@ function test()
> 
>     function dumpWorkerResources() {
>         InspectorTest.log("RESOURCES:");
>-        for (let resource of workerTarget.resourceCollection.items)
>+        for (let resource of workerTarget.resourceCollection)
>             InspectorTest.log(sanitizeURL(resource.url));
>-        if (!workerTarget.resourceCollection.items.size)
>+        if (!workerTarget.resourceCollection.size)
>             InspectorTest.log("-- No Resources --");
>     }
> 
>@@ -71,7 +71,7 @@ function test()
>         name: "Worker.Resource.XHR",
>         description: "Worker XHRs are tied to the Worker Target.",
>         test(resolve, reject) {
>-            InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 1, "Worker Target should have 1 resource.");
>+            InspectorTest.expectEqual(workerTarget.resourceCollection.size, 1, "Worker Target should have 1 resource.");
>             InspectorTest.evaluateInPage("triggerWorkerResourceLoadXHR()");
>             workerTarget.awaitEvent(WI.Target.Event.ResourceAdded)
>                 .then((event) => {
>@@ -80,7 +80,7 @@ function test()
>                     InspectorTest.expectEqual(resource.type, WI.Resource.Type.XHR, "Resource should be XHR.");
>                     InspectorTest.expectEqual(resource.target, workerTarget, "Resource should be tied to the Worker Target.");
>                     InspectorTest.expectNull(resource.parentFrame, "Resource has no parent frame.");
>-                    InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 2, "Worker Target should have 2 resources.");
>+                    InspectorTest.expectEqual(workerTarget.resourceCollection.size, 2, "Worker Target should have 2 resources.");
>                     dumpWorkerResources();
>                     resolve();
>                 }).catch(reject);
>@@ -92,7 +92,7 @@ function test()
>         description: "Main XHRs are tied to the Main Target and not affect the Worker Target",
>         test(resolve, reject) {
>             InspectorTest.evaluateInPage("triggerMainResourceLoadXHR()");
>-            InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 2, "Worker Target should still have 2 resources.");
>+            InspectorTest.expectEqual(workerTarget.resourceCollection.size, 2, "Worker Target should still have 2 resources.");
>             WI.Frame.awaitEvent(WI.Frame.Event.ResourceWasAdded)
>                 .then((event) => {
>                     let resource = event.data.resource;
>@@ -100,7 +100,7 @@ function test()
>                     InspectorTest.expectEqual(resource.type, WI.Resource.Type.XHR, "Resource should be XHR.");
>                     InspectorTest.expectEqual(resource.target, mainTarget, "Resource should be tied to the Main Target.");
>                     InspectorTest.expectEqual(resource.parentFrame, WI.frameResourceManager.mainFrame, "Resource parentFrame is the main frame.");
>-                    InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 2, "Worker Target should still have 2 resources.");
>+                    InspectorTest.expectEqual(workerTarget.resourceCollection.size, 2, "Worker Target should still have 2 resources.");
>                     dumpWorkerResources();
>                     resolve();
>                 }).catch(reject);
>@@ -111,7 +111,7 @@ function test()
>         name: "Worker.Resource.Fetch",
>         description: "Worker fetch requests are tied to the Worker Target.",
>         test(resolve, reject) {
>-            InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 2, "Worker Target should have 2 resources.");
>+            InspectorTest.expectEqual(workerTarget.resourceCollection.size, 2, "Worker Target should have 2 resources.");
>             InspectorTest.evaluateInPage("triggerWorkerResourceLoadFetch()");
>             workerTarget.awaitEvent(WI.Target.Event.ResourceAdded)
>                 .then((event) => {
>@@ -120,7 +120,7 @@ function test()
>                     // FIXME: Add resource type for Fetch that is not XHR?
>                     InspectorTest.expectEqual(resource.target, workerTarget, "Resource should be tied to the Worker Target.");
>                     InspectorTest.expectNull(resource.parentFrame, "Resource has no parent frame.");
>-                    InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 3, "Worker Target should have 3 resources.");
>+                    InspectorTest.expectEqual(workerTarget.resourceCollection.size, 3, "Worker Target should have 3 resources.");
>                     dumpWorkerResources();
>                     resolve();
>                 }).catch(reject);
>@@ -132,7 +132,7 @@ function test()
>         description: "Main fetch requests are tied to the Main Target and not affect the Worker Target",
>         test(resolve, reject) {
>             InspectorTest.evaluateInPage("triggerMainResourceLoadFetch()");
>-            InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 3, "Worker Target should still have 3 resources.");
>+            InspectorTest.expectEqual(workerTarget.resourceCollection.size, 3, "Worker Target should still have 3 resources.");
>             WI.Frame.awaitEvent(WI.Frame.Event.ResourceWasAdded)
>                 .then((event) => {
>                     let resource = event.data.resource;
>@@ -140,7 +140,7 @@ function test()
>                     // FIXME: Add resource type for Fetch that is not XHR?
>                     InspectorTest.expectEqual(resource.target, mainTarget, "Resource should be tied to the Main Target.");
>                     InspectorTest.expectEqual(resource.parentFrame, WI.frameResourceManager.mainFrame, "Resource parentFrame is the main frame.");
>-                    InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 3, "Worker Target should still have 3 resources.");
>+                    InspectorTest.expectEqual(workerTarget.resourceCollection.size, 3, "Worker Target should still have 3 resources.");
>                     dumpWorkerResources();
>                     resolve();
>                 }).catch(reject);
>@@ -151,7 +151,7 @@ function test()
>         name: "Worker.Resource.ImportScript",
>         description: "Worker imported scripts are Resources tied to the Worker Target.",
>         test(resolve, reject) {
>-            InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 3, "Worker Target should still have 3 resources.");
>+            InspectorTest.expectEqual(workerTarget.resourceCollection.size, 3, "Worker Target should still have 3 resources.");
>             InspectorTest.evaluateInPage("triggerWorkerImportScript()");
>             workerTarget.awaitEvent(WI.Target.Event.ResourceAdded)
>                 .then((event) => {
>@@ -160,7 +160,7 @@ function test()
>                     // FIXME: <https://webkit.org/b/164425> Worker Script Loads (new Worker(...), importScripts(...)) should be classified as Scripts not Raw requests
>                     InspectorTest.expectEqual(resource.target, workerTarget, "Resource should be tied to the Worker Target.");
>                     InspectorTest.expectNull(resource.parentFrame, "Resource has no parent frame.");
>-                    InspectorTest.expectEqual(workerTarget.resourceCollection.items.size, 4, "Worker Target should have 4 resources.");
>+                    InspectorTest.expectEqual(workerTarget.resourceCollection.size, 4, "Worker Target should have 4 resources.");
>                     dumpWorkerResources();
>                     resolve();
>                 }).catch(reject);

Actions: View | Formatted Diff | Diff

Attachments on bug 185187: 339280 | 339282 | 339283 | 339288 | 339290 | 339293 | 339575