Changeset 223920 in webkit

Timestamp:

Oct 24, 2017 2:08:01 PM (7 years ago)

Author:

webkit@devinrousso.com

Message:

Web Inspector: remove canvases from Resources and experimental setting/UI
​https://bugs.webkit.org/show_bug.cgi?id=178711

Reviewed by Brian Burg.

• UserInterface/Base/Main.js:

(WI.tabContentViewClassForRepresentedObject):

• UserInterface/Base/Setting.js:
• UserInterface/Controllers/CanvasManager.js:

(WI.CanvasManager.prototype.canvasAdded):
(WI.CanvasManager.prototype.canvasRemoved):

• UserInterface/Models/Canvas.js:
• UserInterface/Models/Frame.js:

(WI.Frame):
(WI.Frame.prototype.get extraScriptCollection):
(WI.Frame.prototype.commitProvisionalLoad):
(WI.Frame.prototype.get canvasCollection): Deleted.

• UserInterface/Views/CanvasTabContentView.js:

(WI.CanvasTabContentView.isTabAllowed):

• UserInterface/Views/FrameTreeElement.js:

(WI.FrameTreeElement):
(WI.FrameTreeElement.prototype.onattach):
(WI.FrameTreeElement.prototype.ondetach):
(WI.FrameTreeElement.prototype.onpopulate):
(WI.FrameTreeElement.prototype._styleSheetAdded):
(WI.FrameTreeElement.prototype._canvasWasAdded): Deleted.
(WI.FrameTreeElement.prototype._canvasWasRemoved): Deleted.

• UserInterface/Views/ResourceSidebarPanel.js:

(WI.ResourceSidebarPanel):
(WI.ResourceSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
(WI.ResourceSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
(WI.ResourceSidebarPanel.prototype._treeSelectionDidChange):

• UserInterface/Views/ResourcesTabContentView.js:

(WI.ResourcesTabContentView):
(WI.ResourcesTabContentView.prototype.canShowRepresentedObject):

• UserInterface/Views/SettingsTabContentView.js:

(WI.SettingsTabContentView.prototype._createExperimentalSettingsView):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Base/Setting.js (modified) (1 diff)
• UserInterface/Controllers/CanvasManager.js (modified) (2 diffs)
• UserInterface/Models/Canvas.js (modified) (1 diff)
• UserInterface/Models/Frame.js (modified) (3 diffs)
• UserInterface/Views/CanvasTabContentView.js (modified) (1 diff)
• UserInterface/Views/FrameTreeElement.js (modified) (5 diffs)
• UserInterface/Views/ResourceSidebarPanel.js (modified) (3 diffs)
• UserInterface/Views/ResourcesTabContentView.js (modified) (2 diffs)
• UserInterface/Views/SettingsTabContentView.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-10-24  Devin Rousso  <webkit@devinrousso.com>
+
+        Web Inspector: remove canvases from Resources and experimental setting/UI
+        https://bugs.webkit.org/show_bug.cgi?id=178711
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WI.tabContentViewClassForRepresentedObject):
+        * UserInterface/Base/Setting.js:
+        * UserInterface/Controllers/CanvasManager.js:
+        (WI.CanvasManager.prototype.canvasAdded):
+        (WI.CanvasManager.prototype.canvasRemoved):
+        * UserInterface/Models/Canvas.js:
+        * UserInterface/Models/Frame.js:
+        (WI.Frame):
+        (WI.Frame.prototype.get extraScriptCollection):
+        (WI.Frame.prototype.commitProvisionalLoad):
+        (WI.Frame.prototype.get canvasCollection): Deleted.
+        * UserInterface/Views/CanvasTabContentView.js:
+        (WI.CanvasTabContentView.isTabAllowed):
+        * UserInterface/Views/FrameTreeElement.js:
+        (WI.FrameTreeElement):
+        (WI.FrameTreeElement.prototype.onattach):
+        (WI.FrameTreeElement.prototype.ondetach):
+        (WI.FrameTreeElement.prototype.onpopulate):
+        (WI.FrameTreeElement.prototype._styleSheetAdded):
+        (WI.FrameTreeElement.prototype._canvasWasAdded): Deleted.
+        (WI.FrameTreeElement.prototype._canvasWasRemoved): Deleted.
+        * UserInterface/Views/ResourceSidebarPanel.js:
+        (WI.ResourceSidebarPanel):
+        (WI.ResourceSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
+        (WI.ResourceSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
+        (WI.ResourceSidebarPanel.prototype._treeSelectionDidChange):
+        * UserInterface/Views/ResourcesTabContentView.js:
+        (WI.ResourcesTabContentView):
+        (WI.ResourcesTabContentView.prototype.canShowRepresentedObject):
+        * UserInterface/Views/SettingsTabContentView.js:
+        (WI.SettingsTabContentView.prototype._createExperimentalSettingsView):
+
 2017-10-24  Devin Rousso  <webkit@devinrousso.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -1087 +1087 @@
         || representedObject instanceof WI.Script
         || representedObject instanceof WI.CSSStyleSheet
-        || representedObject instanceof WI.Canvas
-        || representedObject instanceof WI.ShaderProgram)
+        || (representedObject instanceof WI.Collection && !(representedObject instanceof WI.CanvasCollection)))
         return WI.ResourcesTabContentView;
 

trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js

@@ -127 +127 @@
 
     // Experimental
-    experimentalShowCanvasContextsInResources: new WI.Setting("experimental-show-canvas-contexts-in-resources", false),
     experimentalSpreadsheetStyleEditor: new WI.Setting("experimental-spreadsheet-style-editor", false),
-    experimentalEnableCanvasTab: new WI.Setting("experimental-enable-canvas-tab", false),
     experimentalEnableLayersTab: new WI.Setting("experimental-enable-layers-tab", false),
 };

trunk/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js

@@ -100 +100 @@
         this._canvasIdentifierMap.set(canvas.identifier, canvas);
 
-        canvas.frame.canvasCollection.add(canvas);
-
         this.dispatchEventToListeners(WI.CanvasManager.Event.CanvasWasAdded, {canvas});
     }
@@ -118 +116 @@
             this._dispatchShaderProgramRemoved(program);
         }
-
-        canvas.frame.canvasCollection.remove(canvas);
 
         this.dispatchEventToListeners(WI.CanvasManager.Event.CanvasWasRemoved, {canvas});

trunk/Source/WebInspectorUI/UserInterface/Models/Canvas.js

@@ -293 +293 @@
 };
 
-WI.Canvas.ResourceSidebarType = "resource-type-canvas";
-
 WI.Canvas.Event = {
     MemoryChanged: "canvas-memory-changed",

trunk/Source/WebInspectorUI/UserInterface/Models/Frame.js

@@ -40 +40 @@
         this._provisionalResourceCollection = new WI.ResourceCollection;
         this._extraScriptCollection = new WI.Collection(WI.Collection.TypeVerifier.Script);
-        this._canvasCollection = new WI.Collection(WI.Collection.TypeVerifier.Canvas);
 
         this._childFrameCollection = new WI.Collection(WI.Collection.TypeVerifier.Frame);
@@ -60 +59 @@
     get resourceCollection() { return this._resourceCollection; }
     get extraScriptCollection() { return this._extraScriptCollection; }
-    get canvasCollection() { return this._canvasCollection; }
     get childFrameCollection() { return this._childFrameCollection; }
 
@@ -136 +134 @@
         this._provisionalResourceCollection = new WI.ResourceCollection;
         this._extraScriptCollection.clear();
-        this._canvasCollection.clear();
 
         this.clearExecutionContexts(true);

trunk/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js

@@ -69 +69 @@
     static isTabAllowed()
     {
-        // FIXME: remove experimental setting check once <https://webkit.org/b/175485> is complete.
-        return !!window.CanvasAgent && WI.settings.experimentalEnableCanvasTab.value;
+        return !!window.CanvasAgent;
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js

@@ -49 +49 @@
         this.registerFolderizeSettings("extra-scripts", WI.UIString("Extra Scripts"), this._frame.extraScriptCollection, WI.ScriptTreeElement);
 
-        if (window.CanvasAgent && WI.settings.experimentalShowCanvasContextsInResources.value)
-            this.registerFolderizeSettings("canvases", WI.UIString("Canvases"), this._frame.canvasCollection, WI.CanvasTreeElement);
-
         function forwardingConstructor(representedObject, ...extraArguments) {
             if (representedObject instanceof WI.CSSStyleSheet)
@@ -120 +117 @@
 
         WI.cssStyleManager.addEventListener(WI.CSSStyleManager.Event.StyleSheetAdded, this._styleSheetAdded, this);
-
-        if (window.CanvasAgent && WI.settings.experimentalShowCanvasContextsInResources.value) {
-            this._frame.canvasCollection.addEventListener(WI.Collection.Event.ItemAdded, this._canvasWasAdded, this);
-            this._frame.canvasCollection.addEventListener(WI.Collection.Event.ItemRemoved, this._canvasWasRemoved, this);
-        }
     }
 
@@ -130 +122 @@
     {
         WI.cssStyleManager.removeEventListener(WI.CSSStyleManager.Event.StyleSheetAdded, this._styleSheetAdded, this);
-
-        if (window.CanvasAgent && WI.settings.experimentalShowCanvasContextsInResources.value) {
-            this._frame.canvasCollection.removeEventListener(WI.Collection.Event.ItemAdded, this._canvasWasAdded, this);
-            this._frame.canvasCollection.removeEventListener(WI.Collection.Event.ItemRemoved, this._canvasWasRemoved, this);
-        }
 
         super.ondetach();
@@ -192 +179 @@
         }
 
-        if (window.CanvasAgent && WI.settings.experimentalShowCanvasContextsInResources.value) {
-            for (let canvas of this._frame.canvasCollection.items)
-                this.addChildForRepresentedObject(canvas);
-        }
-
         const doNotCreateIfMissing = true;
         WI.cssStyleManager.preferredInspectorStyleSheetForFrame(this._frame, this.addRepresentedObjectToNewChildQueue.bind(this), doNotCreateIfMissing);
@@ -273 +255 @@
         this.addRepresentedObjectToNewChildQueue(event.data.styleSheet);
     }
-
-    _canvasWasAdded(event)
-    {
-        this.addRepresentedObjectToNewChildQueue(event.data.item);
-    }
-
-    _canvasWasRemoved(event)
-    {
-        this.removeChildForRepresentedObject(event.data.item);
-    }
 };

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js

@@ -49 +49 @@
         }
 
-        if (window.CanvasAgent && WI.settings.experimentalShowCanvasContextsInResources.value) {
-            let canvasesScopeBarItem = new WI.ScopeBarItem(scopeItemPrefix + WI.Canvas.ResourceSidebarType, WI.UIString("Canvases"));
-            canvasesScopeBarItem[WI.ResourceSidebarPanel.ResourceTypeSymbol] = WI.Canvas.ResourceSidebarType;
-            scopeBarItems.insertAtIndex(canvasesScopeBarItem, scopeBarItems.length - 1);
-        }
-
         this._scopeBar = new WI.ScopeBar("resource-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
         this._scopeBar.addEventListener(WI.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
@@ -236 +230 @@
             if (treeElement instanceof WI.ScriptTreeElement)
                 return selectedScopeBarItem[WI.ResourceSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Script;
-
-            if (treeElement instanceof WI.CanvasTreeElement || treeElement instanceof WI.ShaderProgramTreeElement)
-                return selectedScopeBarItem[WI.ResourceSidebarPanel.ResourceTypeSymbol] === WI.Canvas.ResourceSidebarType;
 
             if (treeElement instanceof WI.CSSStyleSheetTreeElement)
@@ -465 +456 @@
             || treeElement instanceof WI.ResourceTreeElement
             || treeElement instanceof WI.ScriptTreeElement
-            || treeElement instanceof WI.CSSStyleSheetTreeElement
-            || treeElement instanceof WI.CanvasTreeElement
-            || treeElement instanceof WI.ShaderProgramTreeElement) {
+            || treeElement instanceof WI.CSSStyleSheetTreeElement) {
             const cookie = null;
             const options = {

trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js

@@ -30 +30 @@
         let {image, title} = WI.ResourcesTabContentView.tabInfo();
         let tabBarItem = new WI.GeneralTabBarItem(image, title);
-        let detailsSidebarPanelConstructors = [WI.ResourceDetailsSidebarPanel, WI.ProbeDetailsSidebarPanel];
-
-        if (window.CanvasAgent && WI.settings.experimentalShowCanvasContextsInResources.value)
-            detailsSidebarPanelConstructors.push(WI.CanvasDetailsSidebarPanel);
-
+        const detailsSidebarPanelConstructors = [WI.ResourceDetailsSidebarPanel, WI.ProbeDetailsSidebarPanel];
         super(identifier || "resources", "resources", tabBarItem, WI.ResourceSidebarPanel, detailsSidebarPanelConstructors);
     }
@@ -64 +60 @@
             || representedObject instanceof WI.Script
             || representedObject instanceof WI.CSSStyleSheet
-            || representedObject instanceof WI.Canvas
-            || representedObject instanceof WI.ShaderProgram
-            || representedObject instanceof WI.Collection;
+            || (representedObject instanceof WI.Collection && !(representedObject instanceof WI.CanvasCollection));
     }
 };

trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js

@@ -240 +240 @@
         let experimentalSettingsView = new WI.SettingsView("experimental", WI.UIString("Experimental"));
 
-        if (window.CanvasAgent) {
-            let canvasSettingsGroup = experimentalSettingsView.addGroup(WI.UIString("Canvas:"));
-            canvasSettingsGroup.addSetting(WI.settings.experimentalEnableCanvasTab, WI.UIString("Enable Canvas Tab"));
-            canvasSettingsGroup.addSetting(WI.settings.experimentalShowCanvasContextsInResources, WI.UIString("Show Contexts in Resources Tab"));
-            experimentalSettingsView.addSeparator();
-        }
-
         if (window.CSSAgent) {
             experimentalSettingsView.addSetting(WI.UIString("Styles Panel:"), WI.settings.experimentalSpreadsheetStyleEditor, WI.UIString("Spreadsheet Style Editor"));
@@ -271 +264 @@
         }
 
-        listenForChange(WI.settings.experimentalShowCanvasContextsInResources);
         listenForChange(WI.settings.experimentalSpreadsheetStyleEditor);
         listenForChange(WI.settings.experimentalEnableLayersTab);
-        listenForChange(WI.settings.experimentalEnableCanvasTab);
 
         this.addSettingsView(experimentalSettingsView);