Changeset 217750 in webkit

Timestamp:

Jun 2, 2017 8:44:51 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Don't create NavigationSidebarPanel classes until they are needed by a Tab
​https://bugs.webkit.org/show_bug.cgi?id=172621

Reviewed by Timothy Hatcher.

• UserInterface/Views/ContentBrowserTabContentView.js:

(WebInspector.ContentBrowserTabContentView):
(WebInspector.ContentBrowserTabContentView.prototype.shown):

• UserInterface/Views/TabContentView.js:

(WebInspector.TabContentView):
(WebInspector.TabContentView.prototype.get navigationSidebarPanel):

• UserInterface/Views/NetworkTabContentView.js:

(WebInspector.NetworkTabContentView.prototype.canShowRepresentedObject):

• UserInterface/Views/SearchTabContentView.js:

(WebInspector.SearchTabContentView.prototype.canShowRepresentedObject):
Use public getter for navigationSidebarPanel.

• UserInterface/Views/ResourceSidebarPanel.js:

(WebInspector.ResourceSidebarPanel):
(WebInspector.ResourceSidebarPanel.prototype.initialLayout): Added.
Load information about the current frame once the sidebar panel is displayed.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ContentBrowserTabContentView.js (modified) (5 diffs)
• UserInterface/Views/NetworkTabContentView.js (modified) (1 diff)
• UserInterface/Views/ResourceSidebarPanel.js (modified) (2 diffs)
• UserInterface/Views/SearchTabContentView.js (modified) (1 diff)
• UserInterface/Views/TabContentView.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-06-02  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Don't create NavigationSidebarPanel classes until they are needed by a Tab
+        https://bugs.webkit.org/show_bug.cgi?id=172621
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/ContentBrowserTabContentView.js:
+        (WebInspector.ContentBrowserTabContentView):
+        (WebInspector.ContentBrowserTabContentView.prototype.shown):
+        * UserInterface/Views/TabContentView.js:
+        (WebInspector.TabContentView):
+        (WebInspector.TabContentView.prototype.get navigationSidebarPanel):
+
+        * UserInterface/Views/NetworkTabContentView.js:
+        (WebInspector.NetworkTabContentView.prototype.canShowRepresentedObject):
+        * UserInterface/Views/SearchTabContentView.js:
+        (WebInspector.SearchTabContentView.prototype.canShowRepresentedObject):
+        Use public getter for navigationSidebarPanel.
+
+        * UserInterface/Views/ResourceSidebarPanel.js:
+        (WebInspector.ResourceSidebarPanel):
+        (WebInspector.ResourceSidebarPanel.prototype.initialLayout): Added.
+        Load information about the current frame once the sidebar panel is displayed.
+
 2017-06-02  Devin Rousso  <drousso@apple.com>
 

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

@@ -26 +26 @@
 WebInspector.ContentBrowserTabContentView = class ContentBrowserTabContentView extends WebInspector.TabContentView
 {
-    constructor(identifier, styleClassNames, tabBarItem, navigationSidebarPanelClass, detailsSidebarPanelConstructors, disableBackForward)
+    constructor(identifier, styleClassNames, tabBarItem, navigationSidebarPanelConstructor, detailsSidebarPanelConstructors, disableBackForward)
     {
         if (typeof styleClassNames === "string")
@@ -34 +34 @@
 
         var contentBrowser = new WebInspector.ContentBrowser(null, null, disableBackForward);
-        var navigationSidebarPanel = navigationSidebarPanelClass ? new navigationSidebarPanelClass(contentBrowser) : null;
-
-        super(identifier, styleClassNames, tabBarItem, navigationSidebarPanel, detailsSidebarPanelConstructors);
+
+        super(identifier, styleClassNames, tabBarItem, navigationSidebarPanelConstructor, detailsSidebarPanelConstructors);
 
         this._contentBrowser = contentBrowser;
@@ -50 +49 @@
         this._contentBrowser.updateHierarchicalPathForCurrentContentView();
 
-        if (navigationSidebarPanel) {
+        if (navigationSidebarPanelConstructor) {
             let showToolTip = WebInspector.UIString("Show the navigation sidebar (%s)").format(WebInspector.navigationSidebarKeyboardShortcut.displayName);
             let hideToolTip = WebInspector.UIString("Hide the navigation sidebar (%s)").format(WebInspector.navigationSidebarKeyboardShortcut.displayName);
@@ -61 +60 @@
             this._contentBrowser.navigationBar.insertNavigationItem(this._showNavigationSidebarItem, 0);
             this._contentBrowser.navigationBar.insertNavigationItem(new WebInspector.DividerNavigationItem, 1);
-
-            navigationSidebarPanel.contentBrowser = this._contentBrowser;
 
             WebInspector.navigationSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._navigationSidebarCollapsedStateDidChange, this);
@@ -100 +97 @@
         this._contentBrowser.shown();
 
-        if (this.navigationSidebarPanel && !this._contentBrowser.currentContentView)
-            this.navigationSidebarPanel.showDefaultContentView();
+        if (this.navigationSidebarPanel) {
+            if (!this.navigationSidebarPanel.contentBrowser)
+                this.navigationSidebarPanel.contentBrowser = this._contentBrowser;
+
+            if (!this._contentBrowser.currentContentView)
+                this.navigationSidebarPanel.showDefaultContentView();
+        }
     }
 

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

@@ -60 +60 @@
             return false;
 
-        return !!this._navigationSidebarPanel.contentTreeOutline.getCachedTreeElement(representedObject);
+        return !!this.navigationSidebarPanel.contentTreeOutline.getCachedTreeElement(representedObject);
     }
 

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

@@ -77 +77 @@
             WebInspector.SourceCode.addEventListener(WebInspector.SourceCode.Event.SourceMapAdded, () => { this.contentTreeOutline.disclosureButtons = true; }, this);
         }
-
-        if (WebInspector.frameResourceManager.mainFrame)
-            this._mainFrameMainResourceDidChange(WebInspector.frameResourceManager.mainFrame);
     }
 
@@ -192 +189 @@
 
     // Protected
+
+    initialLayout()
+    {
+        super.initialLayout();
+
+        if (WebInspector.frameResourceManager.mainFrame)
+            this._mainFrameMainResourceDidChange(WebInspector.frameResourceManager.mainFrame);
+    }
 
     hasCustomFilters()

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

@@ -74 +74 @@
             return false;
 
-        return !!this._navigationSidebarPanel.contentTreeOutline.getCachedTreeElement(representedObject);
+        return !!this.navigationSidebarPanel.contentTreeOutline.getCachedTreeElement(representedObject);
     }
 

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

@@ -26 +26 @@
 WebInspector.TabContentView = class TabContentView extends WebInspector.ContentView
 {
-    constructor(identifier, styleClassNames, tabBarItem, navigationSidebarPanel, detailsSidebarPanelConstructors)
+    constructor(identifier, styleClassNames, tabBarItem, navigationSidebarPanelConstructor, detailsSidebarPanelConstructors)
     {
         console.assert(typeof identifier === "string");
         console.assert(typeof styleClassNames === "string" || styleClassNames.every((className) => typeof className === "string"));
         console.assert(tabBarItem instanceof WebInspector.TabBarItem);
-        console.assert(!navigationSidebarPanel || navigationSidebarPanel instanceof WebInspector.NavigationSidebarPanel);
+        console.assert(!navigationSidebarPanelConstructor || typeof navigationSidebarPanelConstructor === "function");
         console.assert(!detailsSidebarPanelConstructors || detailsSidebarPanelConstructors.every((detailsSidebarPanelConstructor) => typeof detailsSidebarPanelConstructor === "function"));
 
@@ -45 +45 @@
         this._identifier = identifier;
         this._tabBarItem = tabBarItem;
-        this._navigationSidebarPanel = navigationSidebarPanel || null;
+        this._navigationSidebarPanelConstructor = navigationSidebarPanelConstructor || null;
         this._detailsSidebarPanelConstructors = detailsSidebarPanelConstructors || [];
 
@@ -174 +174 @@
     }
 
-    get navigationSidebarPanel() { return this._navigationSidebarPanel; }
+    get navigationSidebarPanel()
+    {
+        if (!this._navigationSidebarPanelConstructor)
+            return null;
+        return WebInspector.instanceForClass(this._navigationSidebarPanelConstructor);
+    }
+
     get navigationSidebarCollapsedSetting() { return this._navigationSidebarCollapsedSetting; }
     get navigationSidebarWidthSetting() { return this._navigationSidebarWidthSetting; }
@@ -185 +191 @@
         return this._detailsSidebarPanels;
     }
+
     get detailsSidebarCollapsedSetting() { return this._detailsSidebarCollapsedSetting; }
     get detailsSidebarSelectedPanelSetting() { return this._detailsSidebarSelectedPanelSetting; }