| Differences between
and this patch
- a/Source/WebInspectorUI/ChangeLog +13 lines
Lines 1-3 a/Source/WebInspectorUI/ChangeLog_sec1
1
2017-05-23  Devin Rousso  <drousso@apple.com>
2
3
        Web Inspector: use initialLayout for NetworkSidebarPanel
4
        https://bugs.webkit.org/show_bug.cgi?id=172470
5
6
        Reviewed by Joseph Pecoraro.
7
8
        * UserInterface/Views/NetworkSidebarPanel.js:
9
        (WebInspector.NetworkSidebarPanel):
10
        (WebInspector.NetworkSidebarPanel.prototype.showDefaultContentView):
11
        (WebInspector.NetworkSidebarPanel.prototype.initialLayout):
12
        Don't create NetworkGridContentView until right before it is shown.
13
1
2017-05-23  Fujii Hironori  <Hironori.Fujii@sony.com>
14
2017-05-23  Fujii Hironori  <Hironori.Fujii@sony.com>
2
15
3
        [GTK] Web Inspector: Add a new icon DockLeft.svg
16
        [GTK] Web Inspector: Add a new icon DockLeft.svg
- a/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js -32 / +36 lines
Lines 35-74 WebInspector.NetworkSidebarPanel = class NetworkSidebarPanel extends WebInspecto a/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js_sec1
35
35
36
        this.filterBar.placeholder = WebInspector.UIString("Filter Resource List");
36
        this.filterBar.placeholder = WebInspector.UIString("Filter Resource List");
37
37
38
        this._navigationBar = new WebInspector.NavigationBar;
39
        this.addSubview(this._navigationBar);
40
41
        this._resourcesTitleBarElement = document.createElement("div");
42
        this._resourcesTitleBarElement.textContent = WebInspector.UIString("Name");
43
        this._resourcesTitleBarElement.classList.add("title-bar");
44
        this.element.appendChild(this._resourcesTitleBarElement);
45
46
        var scopeItemPrefix = "network-sidebar-";
47
        var scopeBarItems = [];
48
49
        scopeBarItems.push(new WebInspector.ScopeBarItem(scopeItemPrefix + "type-all", WebInspector.UIString("All Resources"), true));
50
51
        for (var key in WebInspector.Resource.Type) {
52
            var value = WebInspector.Resource.Type[key];
53
            var scopeBarItem = new WebInspector.ScopeBarItem(scopeItemPrefix + value, WebInspector.Resource.displayNameForType(value, true));
54
            scopeBarItem[WebInspector.NetworkSidebarPanel.ResourceTypeSymbol] = value;
55
            scopeBarItems.push(scopeBarItem);
56
        }
57
58
        this._scopeBar = new WebInspector.ScopeBar("network-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
59
        this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
60
61
        this._navigationBar.addNavigationItem(this._scopeBar);
62
63
        this.contentTreeOutline.element.classList.add("network-grid");
38
        this.contentTreeOutline.element.classList.add("network-grid");
64
        this.contentTreeOutline.disclosureButtons = false;
39
        this.contentTreeOutline.disclosureButtons = false;
65
66
        this.contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
67
68
        var networkTimeline = WebInspector.timelineManager.persistentNetworkTimeline;
69
        networkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
70
71
        this._networkGridView = new WebInspector.NetworkGridContentView(null, {networkSidebarPanel: this});
72
    }
40
    }
73
41
74
    // Public
42
    // Public
Lines 80-85 WebInspector.NetworkSidebarPanel = class NetworkSidebarPanel extends WebInspecto a/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js_sec2
80
48
81
    showDefaultContentView()
49
    showDefaultContentView()
82
    {
50
    {
51
        if (!this._networkGridView)
52
            this._networkGridView = new WebInspector.NetworkGridContentView(null, {networkSidebarPanel: this});
53
83
        this.contentBrowser.showContentView(this._networkGridView);
54
        this.contentBrowser.showContentView(this._networkGridView);
84
    }
55
    }
85
56
Lines 96-101 WebInspector.NetworkSidebarPanel = class NetworkSidebarPanel extends WebInspecto a/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js_sec3
96
67
97
    // Protected
68
    // Protected
98
69
70
    initialLayout()
71
    {
72
        this._navigationBar = new WebInspector.NavigationBar;
73
        this.addSubview(this._navigationBar);
74
75
        this._resourcesTitleBarElement = document.createElement("div");
76
        this._resourcesTitleBarElement.textContent = WebInspector.UIString("Name");
77
        this._resourcesTitleBarElement.classList.add("title-bar");
78
        this.element.appendChild(this._resourcesTitleBarElement);
79
80
        let scopeItemPrefix = "network-sidebar-";
81
        let scopeBarItems = [];
82
83
        scopeBarItems.push(new WebInspector.ScopeBarItem(scopeItemPrefix + "type-all", WebInspector.UIString("All Resources"), true));
84
85
        for (let key in WebInspector.Resource.Type) {
86
            let value = WebInspector.Resource.Type[key];
87
            let scopeBarItem = new WebInspector.ScopeBarItem(scopeItemPrefix + value, WebInspector.Resource.displayNameForType(value, true));
88
            scopeBarItem[WebInspector.NetworkSidebarPanel.ResourceTypeSymbol] = value;
89
            scopeBarItems.push(scopeBarItem);
90
        }
91
92
        this._scopeBar = new WebInspector.ScopeBar("network-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
93
        this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
94
95
        this._navigationBar.addNavigationItem(this._scopeBar);
96
97
        WebInspector.timelineManager.persistentNetworkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
98
99
        this.contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
100
        this._contentBrowserCurrentContentViewDidChange();
101
    }
102
99
    saveStateToCookie(cookie)
103
    saveStateToCookie(cookie)
100
    {
104
    {
101
        console.assert(cookie);
105
        console.assert(cookie);

Return to Bug 172470