Attachment 310910 Details for Bug 172470 – Patch

[patch] Patch

bug-172470-20170522134419.patch (text/plain), 5.45 KB, created by Devin Rousso on 2017-05-22 13:44:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2017-05-22 13:44:20 PDT

Size: 5.45 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 3c6f3c3d8bdd8334c64cec621aab089069afb691..7fd005e8df8a3d94439724ea9825843b20c25be6 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,16 @@
>+2017-05-22  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: use initialLayout for NetworkSidebarPanel
>+        https://bugs.webkit.org/show_bug.cgi?id=172470
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/NetworkSidebarPanel.js:
>+        (WebInspector.NetworkSidebarPanel):
>+        (WebInspector.NetworkSidebarPanel.prototype.showDefaultContentView):
>+        (WebInspector.NetworkSidebarPanel.prototype.initialLayout):
>+        Don't create NetworkGridContentView until right before it is shown.
>+
> 2017-05-22  Simon Fraser  <simon.fraser@apple.com>
> 
>         Support transform-box to switch sizing box in SVG
>diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js
>index d4f5eb25be8196d9dfe9d22a7f9304bb18ecbaa3..5aed1d82a125dd555fdc61914bce0867b205d041 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js
>@@ -35,40 +35,10 @@ WebInspector.NetworkSidebarPanel = class NetworkSidebarPanel extends WebInspecto
> 
>         this.filterBar.placeholder = WebInspector.UIString("Filter Resource List");
> 
>-        this._navigationBar = new WebInspector.NavigationBar;
>-        this.addSubview(this._navigationBar);
>-
>-        this._resourcesTitleBarElement = document.createElement("div");
>-        this._resourcesTitleBarElement.textContent = WebInspector.UIString("Name");
>-        this._resourcesTitleBarElement.classList.add("title-bar");
>-        this.element.appendChild(this._resourcesTitleBarElement);
>-
>-        var scopeItemPrefix = "network-sidebar-";
>-        var scopeBarItems = [];
>-
>-        scopeBarItems.push(new WebInspector.ScopeBarItem(scopeItemPrefix + "type-all", WebInspector.UIString("All Resources"), true));
>-
>-        for (var key in WebInspector.Resource.Type) {
>-            var value = WebInspector.Resource.Type[key];
>-            var scopeBarItem = new WebInspector.ScopeBarItem(scopeItemPrefix + value, WebInspector.Resource.displayNameForType(value, true));
>-            scopeBarItem[WebInspector.NetworkSidebarPanel.ResourceTypeSymbol] = value;
>-            scopeBarItems.push(scopeBarItem);
>-        }
>-
>-        this._scopeBar = new WebInspector.ScopeBar("network-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
>-        this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
>-
>-        this._navigationBar.addNavigationItem(this._scopeBar);
>-
>         this.contentTreeOutline.element.classList.add("network-grid");
>         this.contentTreeOutline.disclosureButtons = false;
> 
>         this.contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
>-
>-        var networkTimeline = WebInspector.timelineManager.persistentNetworkTimeline;
>-        networkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
>-
>-        this._networkGridView = new WebInspector.NetworkGridContentView(null, {networkSidebarPanel: this});
>     }
> 
>     // Public
>@@ -80,6 +50,9 @@ WebInspector.NetworkSidebarPanel = class NetworkSidebarPanel extends WebInspecto
> 
>     showDefaultContentView()
>     {
>+        if (!this._networkGridView)
>+            this._networkGridView = new WebInspector.NetworkGridContentView(null, {networkSidebarPanel: this});
>+
>         this.contentBrowser.showContentView(this._networkGridView);
>     }
> 
>@@ -96,6 +69,36 @@ WebInspector.NetworkSidebarPanel = class NetworkSidebarPanel extends WebInspecto
> 
>     // Protected
> 
>+    initialLayout()
>+    {
>+        this._navigationBar = new WebInspector.NavigationBar;
>+        this.addSubview(this._navigationBar);
>+
>+        this._resourcesTitleBarElement = document.createElement("div");
>+        this._resourcesTitleBarElement.textContent = WebInspector.UIString("Name");
>+        this._resourcesTitleBarElement.classList.add("title-bar");
>+        this.element.appendChild(this._resourcesTitleBarElement);
>+
>+        var scopeItemPrefix = "network-sidebar-";
>+        var scopeBarItems = [];
>+
>+        scopeBarItems.push(new WebInspector.ScopeBarItem(scopeItemPrefix + "type-all", WebInspector.UIString("All Resources"), true));
>+
>+        for (var key in WebInspector.Resource.Type) {
>+            var value = WebInspector.Resource.Type[key];
>+            var scopeBarItem = new WebInspector.ScopeBarItem(scopeItemPrefix + value, WebInspector.Resource.displayNameForType(value, true));
>+            scopeBarItem[WebInspector.NetworkSidebarPanel.ResourceTypeSymbol] = value;
>+            scopeBarItems.push(scopeBarItem);
>+        }
>+
>+        this._scopeBar = new WebInspector.ScopeBar("network-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
>+        this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
>+
>+        this._navigationBar.addNavigationItem(this._scopeBar);
>+
>+        WebInspector.timelineManager.persistentNetworkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
>+    }
>+
>     saveStateToCookie(cookie)
>     {
>         console.assert(cookie);

Flags:

joepeck: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 172470: 310910 | 310912 | 310913 | 311042