Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (221884 => 221885)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-09-11 22:23:51 UTC (rev 221885)
@@ -1,5 +1,27 @@
2017-09-11 Joseph Pecoraro <[email protected]>
+ Web Inspector: Rename NetworkTab / NetworkSidebar to LegacyNetwork*
+ https://bugs.webkit.org/show_bug.cgi?id=176739
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Main.html:
+ * UserInterface/Views/LegacyNetworkSidebarPanel.css: Renamed from Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css.
+ * UserInterface/Views/LegacyNetworkSidebarPanel.js: Renamed from Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js.
+ * UserInterface/Views/LegacyNetworkTabContentView.js: Renamed from Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js.
+ Rename resources.
+
+ * UserInterface/Base/Main.js:
+ (WI.contentLoaded):
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WI.NetworkGridContentView):
+ (WI.NetworkGridContentView.prototype._networkTimelineRecordAdded):
+ * UserInterface/Views/TabBrowser.js:
+ (WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
+ Update names at callsites.
+
+2017-09-11 Joseph Pecoraro <[email protected]>
+
Web Inspector: Remove unused parameter to UIString
https://bugs.webkit.org/show_bug.cgi?id=176738
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -438,7 +438,7 @@
WI.DebuggerTabContentView,
WI.ElementsTabContentView,
WI.LayersTabContentView,
- WI.NetworkTabContentView,
+ WI.LegacyNetworkTabContentView,
WI.NewTabContentView,
WI.RecordingTabContentView,
WI.ResourcesTabContentView,
@@ -1002,9 +1002,9 @@
WI.showNetworkTab = function()
{
- var tabContentView = this.tabBrowser.bestTabContentViewForClass(WI.NetworkTabContentView);
+ var tabContentView = this.tabBrowser.bestTabContentViewForClass(WI.LegacyNetworkTabContentView);
if (!tabContentView)
- tabContentView = new WI.NetworkTabContentView;
+ tabContentView = new WI.LegacyNetworkTabContentView;
this.tabBrowser.showTabForContentView(tabContentView);
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-09-11 22:23:51 UTC (rev 221885)
@@ -113,6 +113,7 @@
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
+ <link rel="stylesheet" href=""
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
@@ -122,7 +123,6 @@
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
- <link rel="stylesheet" href=""
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
@@ -483,7 +483,7 @@
<script src=""
<script src=""
<script src=""
- <script src=""
+ <script src=""
<script src=""
<script src=""
<script src=""
@@ -633,6 +633,7 @@
<script src=""
<script src=""
<script src=""
+ <script src=""
<script src=""
<script src=""
<script src=""
@@ -641,7 +642,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Copied: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkSidebarPanel.css (from rev 221884, trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css) (0 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkSidebarPanel.css (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkSidebarPanel.css 2017-09-11 22:23:51 UTC (rev 221885)
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+.sidebar > .panel.navigation.network > :matches(.content, .empty-content-placeholder) {
+ top: 52px;
+}
+
+.sidebar > .panel.navigation.network > .navigation-bar {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+}
+
+.sidebar > .panel.navigation.network > .title-bar {
+ position: absolute;
+ top: var(--navigation-bar-height);
+ left: 0;
+ right: 0;
+
+ height: 23px;
+
+ border-bottom: 1px solid var(--border-color);
+ background-color: var(--panel-background-color);
+ color: hsl(0, 0%, 22%);
+
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+ font-weight: bold;
+
+ padding: 4px 9px;
+
+ white-space: nowrap;
+ overflow: hidden;
+}
+
+.sidebar > .panel.navigation.network.network-grid-content-view-showing > .content {
+ /* This hides the scrollbar. The view shows a scrollbar, we don't need two. */
+ padding-right: 16px;
+ right: -16px;
+ overflow-y: overlay;
+}
+
+.sidebar > .panel.navigation.network .item:not(:hover, .selected) .status .status-button,
+.sidebar > .panel.navigation.network .item:hover:not(.selected) .status .close.status-button {
+ display: none;
+}
+
+.sidebar > .panel.navigation.network:not(.network-grid-content-view-showing) .status .go-to-arrow.status-button {
+ display: none;
+}
+
+.sidebar > .panel.navigation.network .status .close.status-button {
+ padding-bottom: 1px;
+}
+
+.sidebar > .panel.navigation.network.network-grid-content-view-showing .status .close.status-button {
+ display: none;
+}
+
+.sidebar > .panel.navigation.network.network-grid-content-view-showing .tree-outline.network-grid .item .subtitle {
+ display: none;
+}
+
+.sidebar > .panel.navigation.network > .content > .tree-outline {
+ min-height: 100%;
+ background-image: none;
+}
+
+.sidebar > .panel.navigation.network.network-grid-content-view-showing > .content > .tree-outline {
+ background: var(--transparent-stripe-background-gradient);
+}
+
+.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > :not(.status) {
+ opacity: 0.5;
+}
+
+.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > .icon {
+ filter: grayscale();
+}
Copied: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkSidebarPanel.js (from rev 221884, trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js) (0 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkSidebarPanel.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkSidebarPanel.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WI.LegacyNetworkSidebarPanel = class LegacyNetworkSidebarPanel extends WI.NavigationSidebarPanel
+{
+ constructor(contentBrowser)
+ {
+ super("network", WI.UIString("Network"), false);
+
+ WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+
+ this.contentBrowser = contentBrowser;
+
+ this.contentTreeOutline.element.classList.add("network-grid");
+ this.contentTreeOutline.disclosureButtons = false;
+ }
+
+ // Public
+
+ get minimumWidth()
+ {
+ return this._navigationBar.minimumWidth;
+ }
+
+ showDefaultContentView()
+ {
+ if (!this._networkGridView)
+ this._networkGridView = new WI.NetworkGridContentView(null, {legacyNetworkSidebarPanel: this});
+
+ this.contentBrowser.showContentView(this._networkGridView);
+ }
+
+ canShowDifferentContentView()
+ {
+ if (this._clickedTreeElementGoToArrow)
+ return true;
+
+ if (this.contentBrowser.currentContentView instanceof WI.NetworkGridContentView)
+ return false;
+
+ return !this.restoringState;
+ }
+
+ // Protected
+
+ initialLayout()
+ {
+ this._navigationBar = new WI.NavigationBar;
+ this.addSubview(this._navigationBar);
+
+ this._resourcesTitleBarElement = document.createElement("div");
+ this._resourcesTitleBarElement.textContent = WI.UIString("Name");
+ this._resourcesTitleBarElement.classList.add("title-bar");
+ this.element.appendChild(this._resourcesTitleBarElement);
+
+ let scopeItemPrefix = "network-sidebar-";
+ let scopeBarItems = [];
+
+ scopeBarItems.push(new WI.ScopeBarItem(scopeItemPrefix + "type-all", WI.UIString("All Resources"), true));
+
+ for (let key in WI.Resource.Type) {
+ let value = WI.Resource.Type[key];
+ let scopeBarItem = new WI.ScopeBarItem(scopeItemPrefix + value, WI.Resource.displayNameForType(value, true));
+ scopeBarItem[WI.LegacyNetworkSidebarPanel.ResourceTypeSymbol] = value;
+ scopeBarItems.push(scopeBarItem);
+ }
+
+ this._scopeBar = new WI.ScopeBar("network-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
+ this._scopeBar.addEventListener(WI.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
+
+ this._navigationBar.addNavigationItem(this._scopeBar);
+
+ WI.timelineManager.persistentNetworkTimeline.addEventListener(WI.Timeline.Event.Reset, this._networkTimelineReset, this);
+
+ this.contentBrowser.addEventListener(WI.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
+ this._contentBrowserCurrentContentViewDidChange();
+ }
+
+ saveStateToCookie(cookie)
+ {
+ console.assert(cookie);
+
+ cookie[WI.LegacyNetworkSidebarPanel.ShowingNetworkGridContentViewCookieKey] = this.contentBrowser.currentContentView instanceof WI.NetworkGridContentView;
+
+ super.saveStateToCookie(cookie);
+ }
+
+ restoreStateFromCookie(cookie, relaxedMatchDelay)
+ {
+ console.assert(cookie);
+
+ // Don't call NavigationSidebarPanel.restoreStateFromCookie, because it tries to match based
+ // on type selected tree element. This would cause the grid to be deselected.
+ if (cookie[WI.LegacyNetworkSidebarPanel.ShowingNetworkGridContentViewCookieKey])
+ return;
+
+ super.restoreStateFromCookie(cookie, relaxedMatchDelay);
+ }
+
+ hasCustomFilters()
+ {
+ console.assert(this._scopeBar.selectedItems.length === 1);
+ var selectedScopeBarItem = this._scopeBar.selectedItems[0];
+ return selectedScopeBarItem && !selectedScopeBarItem.exclusive;
+ }
+
+ matchTreeElementAgainstCustomFilters(treeElement, flags)
+ {
+ console.assert(this._scopeBar.selectedItems.length === 1);
+ var selectedScopeBarItem = this._scopeBar.selectedItems[0];
+
+ // Show everything if there is no selection or "All Resources" is selected (the exclusive item).
+ if (!selectedScopeBarItem || selectedScopeBarItem.exclusive)
+ return true;
+
+ function match()
+ {
+ if (treeElement instanceof WI.FrameTreeElement)
+ return selectedScopeBarItem[WI.LegacyNetworkSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Document;
+
+ console.assert(treeElement instanceof WI.ResourceTreeElement, "Unknown treeElement", treeElement);
+ if (!(treeElement instanceof WI.ResourceTreeElement))
+ return false;
+
+ return treeElement.resource.type === selectedScopeBarItem[WI.LegacyNetworkSidebarPanel.ResourceTypeSymbol];
+ }
+
+ var matched = match();
+ if (matched)
+ flags.expandTreeElement = true;
+ return matched;
+ }
+
+ treeElementAddedOrChanged(treeElement)
+ {
+ if (treeElement.status && treeElement.status[WI.LegacyNetworkSidebarPanel.TreeElementStatusButtonSymbol] || !treeElement.treeOutline)
+ return;
+
+ var fragment = document.createDocumentFragment();
+
+ var closeButton = new WI.TreeElementStatusButton(useSVGSymbol("Images/Close.svg", null, WI.UIString("Close resource view")));
+ closeButton.element.classList.add("close");
+ closeButton.addEventListener(WI.TreeElementStatusButton.Event.Clicked, this._treeElementCloseButtonClicked, this);
+ fragment.appendChild(closeButton.element);
+
+ let goToButton = new WI.TreeElementStatusButton(WI.createGoToArrowButton());
+ goToButton[WI.LegacyNetworkSidebarPanel.TreeElementSymbol] = treeElement;
+ goToButton.addEventListener(WI.TreeElementStatusButton.Event.Clicked, this._treeElementGoToArrowWasClicked, this);
+ fragment.appendChild(goToButton.element);
+
+ treeElement.status = fragment;
+ treeElement.status[WI.LegacyNetworkSidebarPanel.TreeElementStatusButtonSymbol] = true;
+ }
+
+ // Private
+
+ _mainResourceDidChange(event)
+ {
+ let frame = event.target;
+ if (!frame.isMainFrame() || WI.settings.clearNetworkOnNavigate.value)
+ return;
+
+ for (let treeElement of this.contentTreeOutline.children)
+ treeElement.element.classList.add("preserved");
+ }
+
+ _networkTimelineReset(event)
+ {
+ this.contentBrowser.contentViewContainer.closeAllContentViews();
+ this.showDefaultContentView();
+ }
+
+ _contentBrowserCurrentContentViewDidChange(event)
+ {
+ var didShowNetworkGridContentView = this.contentBrowser.currentContentView instanceof WI.NetworkGridContentView;
+ this.element.classList.toggle("network-grid-content-view-showing", didShowNetworkGridContentView);
+ }
+
+ _treeElementGoToArrowWasClicked(event)
+ {
+ this._clickedTreeElementGoToArrow = true;
+
+ let treeElement = event.target[WI.LegacyNetworkSidebarPanel.TreeElementSymbol];
+ console.assert(treeElement instanceof WI.TreeElement);
+
+ treeElement.select(true, true);
+
+ this._clickedTreeElementGoToArrow = false;
+ }
+
+ _treeElementCloseButtonClicked(event)
+ {
+ // Say we are processing a selection change to avoid the selected tree element
+ // from being deselected when the default content view is shown.
+ this.contentTreeOutline.processingSelectionChange = true;
+
+ this.showDefaultContentView();
+
+ this.contentTreeOutline.processingSelectionChange = false;
+ }
+
+ _scopeBarSelectionDidChange(event)
+ {
+ this.updateFilter();
+ }
+};
+
+WI.LegacyNetworkSidebarPanel.ResourceTypeSymbol = Symbol("resource-type");
+WI.LegacyNetworkSidebarPanel.TreeElementSymbol = Symbol("tree-element");
+WI.LegacyNetworkSidebarPanel.TreeElementStatusButtonSymbol = Symbol("tree-element-status-button");
+
+WI.LegacyNetworkSidebarPanel.ShowingNetworkGridContentViewCookieKey = "network-sidebar-panel-showing-network-grid-content-view";
Copied: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkTabContentView.js (from rev 221884, trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js) (0 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkTabContentView.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyNetworkTabContentView.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WI.LegacyNetworkTabContentView = class LegacyNetworkTabContentView extends WI.ContentBrowserTabContentView
+{
+ constructor(identifier)
+ {
+ let {image, title} = WI.LegacyNetworkTabContentView.tabInfo();
+ let tabBarItem = new WI.GeneralTabBarItem(image, title);
+ let detailsSidebarPanelConstructors = [WI.ResourceDetailsSidebarPanel, WI.ProbeDetailsSidebarPanel];
+
+ super(identifier || "network", "network", tabBarItem, WI.LegacyNetworkSidebarPanel, detailsSidebarPanelConstructors);
+ }
+
+ static tabInfo()
+ {
+ return {
+ image: "Images/Network.svg",
+ title: WI.UIString("Network"),
+ };
+ }
+
+ static isTabAllowed()
+ {
+ return !!window.NetworkAgent && !!window.PageAgent;
+ }
+
+ // Public
+
+ get type()
+ {
+ return WI.LegacyNetworkTabContentView.Type;
+ }
+
+ canShowRepresentedObject(representedObject)
+ {
+ if (!(representedObject instanceof WI.Resource))
+ return false;
+
+ return !!this.navigationSidebarPanel.contentTreeOutline.getCachedTreeElement(representedObject);
+ }
+
+ get supportsSplitContentBrowser()
+ {
+ // Since the Network tab has a real sidebar, showing the split console would cause items in
+ // the sidebar to be aligned with an item in the datagrid that isn't shown.
+ return false;
+ }
+};
+
+WI.LegacyNetworkTabContentView.Type = "network";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -28,13 +28,13 @@
constructor(representedObject, extraArguments)
{
console.assert(extraArguments);
- console.assert(extraArguments.networkSidebarPanel instanceof WI.NetworkSidebarPanel);
+ console.assert(extraArguments.legacyNetworkSidebarPanel instanceof WI.LegacyNetworkSidebarPanel);
super(representedObject);
WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
- this._networkSidebarPanel = extraArguments.networkSidebarPanel;
+ this._networkSidebarPanel = extraArguments.legacyNetworkSidebarPanel;
this._contentTreeOutline = this._networkSidebarPanel.contentTreeOutline;
this._contentTreeOutline.addEventListener(WI.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
@@ -371,7 +371,7 @@
this._startTime = this._endTime = resourceTimelineRecord.startTime;
// FIXME: <https://webkit.org/b/153634> Web Inspector: some background tabs think they are the foreground tab and do unnecessary work
- if (!(WI.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView))
+ if (!(WI.tabBrowser.selectedTabContentView instanceof WI.LegacyNetworkTabContentView))
return;
this._startUpdatingCurrentTime();
Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css 2017-09-11 22:23:51 UTC (rev 221885)
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-.sidebar > .panel.navigation.network > :matches(.content, .empty-content-placeholder) {
- top: 52px;
-}
-
-.sidebar > .panel.navigation.network > .navigation-bar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
-}
-
-.sidebar > .panel.navigation.network > .title-bar {
- position: absolute;
- top: var(--navigation-bar-height);
- left: 0;
- right: 0;
-
- height: 23px;
-
- border-bottom: 1px solid var(--border-color);
- background-color: var(--panel-background-color);
- color: hsl(0, 0%, 22%);
-
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-
- font-weight: bold;
-
- padding: 4px 9px;
-
- white-space: nowrap;
- overflow: hidden;
-}
-
-.sidebar > .panel.navigation.network.network-grid-content-view-showing > .content {
- /* This hides the scrollbar. The view shows a scrollbar, we don't need two. */
- padding-right: 16px;
- right: -16px;
- overflow-y: overlay;
-}
-
-.sidebar > .panel.navigation.network .item:not(:hover, .selected) .status .status-button,
-.sidebar > .panel.navigation.network .item:hover:not(.selected) .status .close.status-button {
- display: none;
-}
-
-.sidebar > .panel.navigation.network:not(.network-grid-content-view-showing) .status .go-to-arrow.status-button {
- display: none;
-}
-
-.sidebar > .panel.navigation.network .status .close.status-button {
- padding-bottom: 1px;
-}
-
-.sidebar > .panel.navigation.network.network-grid-content-view-showing .status .close.status-button {
- display: none;
-}
-
-.sidebar > .panel.navigation.network.network-grid-content-view-showing .tree-outline.network-grid .item .subtitle {
- display: none;
-}
-
-.sidebar > .panel.navigation.network > .content > .tree-outline {
- min-height: 100%;
- background-image: none;
-}
-
-.sidebar > .panel.navigation.network.network-grid-content-view-showing > .content > .tree-outline {
- background: var(--transparent-stripe-background-gradient);
-}
-
-.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > :not(.status) {
- opacity: 0.5;
-}
-
-.sidebar > .panel.navigation.network .tree-outline > .preserved:not(.selected) > .icon {
- filter: grayscale();
-}
Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -1,234 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WI.NetworkSidebarPanel = class NetworkSidebarPanel extends WI.NavigationSidebarPanel
-{
- constructor(contentBrowser)
- {
- super("network", WI.UIString("Network"), false);
-
- WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
-
- this.contentBrowser = contentBrowser;
-
- this.contentTreeOutline.element.classList.add("network-grid");
- this.contentTreeOutline.disclosureButtons = false;
- }
-
- // Public
-
- get minimumWidth()
- {
- return this._navigationBar.minimumWidth;
- }
-
- showDefaultContentView()
- {
- if (!this._networkGridView)
- this._networkGridView = new WI.NetworkGridContentView(null, {networkSidebarPanel: this});
-
- this.contentBrowser.showContentView(this._networkGridView);
- }
-
- canShowDifferentContentView()
- {
- if (this._clickedTreeElementGoToArrow)
- return true;
-
- if (this.contentBrowser.currentContentView instanceof WI.NetworkGridContentView)
- return false;
-
- return !this.restoringState;
- }
-
- // Protected
-
- initialLayout()
- {
- this._navigationBar = new WI.NavigationBar;
- this.addSubview(this._navigationBar);
-
- this._resourcesTitleBarElement = document.createElement("div");
- this._resourcesTitleBarElement.textContent = WI.UIString("Name");
- this._resourcesTitleBarElement.classList.add("title-bar");
- this.element.appendChild(this._resourcesTitleBarElement);
-
- let scopeItemPrefix = "network-sidebar-";
- let scopeBarItems = [];
-
- scopeBarItems.push(new WI.ScopeBarItem(scopeItemPrefix + "type-all", WI.UIString("All Resources"), true));
-
- for (let key in WI.Resource.Type) {
- let value = WI.Resource.Type[key];
- let scopeBarItem = new WI.ScopeBarItem(scopeItemPrefix + value, WI.Resource.displayNameForType(value, true));
- scopeBarItem[WI.NetworkSidebarPanel.ResourceTypeSymbol] = value;
- scopeBarItems.push(scopeBarItem);
- }
-
- this._scopeBar = new WI.ScopeBar("network-sidebar-scope-bar", scopeBarItems, scopeBarItems[0], true);
- this._scopeBar.addEventListener(WI.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
-
- this._navigationBar.addNavigationItem(this._scopeBar);
-
- WI.timelineManager.persistentNetworkTimeline.addEventListener(WI.Timeline.Event.Reset, this._networkTimelineReset, this);
-
- this.contentBrowser.addEventListener(WI.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
- this._contentBrowserCurrentContentViewDidChange();
- }
-
- saveStateToCookie(cookie)
- {
- console.assert(cookie);
-
- cookie[WI.NetworkSidebarPanel.ShowingNetworkGridContentViewCookieKey] = this.contentBrowser.currentContentView instanceof WI.NetworkGridContentView;
-
- super.saveStateToCookie(cookie);
- }
-
- restoreStateFromCookie(cookie, relaxedMatchDelay)
- {
- console.assert(cookie);
-
- // Don't call NavigationSidebarPanel.restoreStateFromCookie, because it tries to match based
- // on type selected tree element. This would cause the grid to be deselected.
- if (cookie[WI.NetworkSidebarPanel.ShowingNetworkGridContentViewCookieKey])
- return;
-
- super.restoreStateFromCookie(cookie, relaxedMatchDelay);
- }
-
- hasCustomFilters()
- {
- console.assert(this._scopeBar.selectedItems.length === 1);
- var selectedScopeBarItem = this._scopeBar.selectedItems[0];
- return selectedScopeBarItem && !selectedScopeBarItem.exclusive;
- }
-
- matchTreeElementAgainstCustomFilters(treeElement, flags)
- {
- console.assert(this._scopeBar.selectedItems.length === 1);
- var selectedScopeBarItem = this._scopeBar.selectedItems[0];
-
- // Show everything if there is no selection or "All Resources" is selected (the exclusive item).
- if (!selectedScopeBarItem || selectedScopeBarItem.exclusive)
- return true;
-
- function match()
- {
- if (treeElement instanceof WI.FrameTreeElement)
- return selectedScopeBarItem[WI.NetworkSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Document;
-
- console.assert(treeElement instanceof WI.ResourceTreeElement, "Unknown treeElement", treeElement);
- if (!(treeElement instanceof WI.ResourceTreeElement))
- return false;
-
- return treeElement.resource.type === selectedScopeBarItem[WI.NetworkSidebarPanel.ResourceTypeSymbol];
- }
-
- var matched = match();
- if (matched)
- flags.expandTreeElement = true;
- return matched;
- }
-
- treeElementAddedOrChanged(treeElement)
- {
- if (treeElement.status && treeElement.status[WI.NetworkSidebarPanel.TreeElementStatusButtonSymbol] || !treeElement.treeOutline)
- return;
-
- var fragment = document.createDocumentFragment();
-
- var closeButton = new WI.TreeElementStatusButton(useSVGSymbol("Images/Close.svg", null, WI.UIString("Close resource view")));
- closeButton.element.classList.add("close");
- closeButton.addEventListener(WI.TreeElementStatusButton.Event.Clicked, this._treeElementCloseButtonClicked, this);
- fragment.appendChild(closeButton.element);
-
- let goToButton = new WI.TreeElementStatusButton(WI.createGoToArrowButton());
- goToButton[WI.NetworkSidebarPanel.TreeElementSymbol] = treeElement;
- goToButton.addEventListener(WI.TreeElementStatusButton.Event.Clicked, this._treeElementGoToArrowWasClicked, this);
- fragment.appendChild(goToButton.element);
-
- treeElement.status = fragment;
- treeElement.status[WI.NetworkSidebarPanel.TreeElementStatusButtonSymbol] = true;
- }
-
- // Private
-
- _mainResourceDidChange(event)
- {
- let frame = event.target;
- if (!frame.isMainFrame() || WI.settings.clearNetworkOnNavigate.value)
- return;
-
- for (let treeElement of this.contentTreeOutline.children)
- treeElement.element.classList.add("preserved");
- }
-
- _networkTimelineReset(event)
- {
- this.contentBrowser.contentViewContainer.closeAllContentViews();
- this.showDefaultContentView();
- }
-
- _contentBrowserCurrentContentViewDidChange(event)
- {
- var didShowNetworkGridContentView = this.contentBrowser.currentContentView instanceof WI.NetworkGridContentView;
- this.element.classList.toggle("network-grid-content-view-showing", didShowNetworkGridContentView);
- }
-
- _treeElementGoToArrowWasClicked(event)
- {
- this._clickedTreeElementGoToArrow = true;
-
- let treeElement = event.target[WI.NetworkSidebarPanel.TreeElementSymbol];
- console.assert(treeElement instanceof WI.TreeElement);
-
- treeElement.select(true, true);
-
- this._clickedTreeElementGoToArrow = false;
- }
-
- _treeElementCloseButtonClicked(event)
- {
- // Say we are processing a selection change to avoid the selected tree element
- // from being deselected when the default content view is shown.
- this.contentTreeOutline.processingSelectionChange = true;
-
- this.showDefaultContentView();
-
- this.contentTreeOutline.processingSelectionChange = false;
- }
-
- _scopeBarSelectionDidChange(event)
- {
- this.updateFilter();
- }
-};
-
-WI.NetworkSidebarPanel.ResourceTypeSymbol = Symbol("resource-type");
-WI.NetworkSidebarPanel.TreeElementSymbol = Symbol("tree-element");
-WI.NetworkSidebarPanel.TreeElementStatusButtonSymbol = Symbol("tree-element-status-button");
-
-WI.NetworkSidebarPanel.ShowingNetworkGridContentViewCookieKey = "network-sidebar-panel-showing-network-grid-content-view";
Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WI.NetworkTabContentView = class NetworkTabContentView extends WI.ContentBrowserTabContentView
-{
- constructor(identifier)
- {
- let {image, title} = WI.NetworkTabContentView.tabInfo();
- let tabBarItem = new WI.GeneralTabBarItem(image, title);
- let detailsSidebarPanelConstructors = [WI.ResourceDetailsSidebarPanel, WI.ProbeDetailsSidebarPanel];
-
- super(identifier || "network", "network", tabBarItem, WI.NetworkSidebarPanel, detailsSidebarPanelConstructors);
- }
-
- static tabInfo()
- {
- return {
- image: "Images/Network.svg",
- title: WI.UIString("Network"),
- };
- }
-
- static isTabAllowed()
- {
- return !!window.NetworkAgent && !!window.PageAgent;
- }
-
- // Public
-
- get type()
- {
- return WI.NetworkTabContentView.Type;
- }
-
- canShowRepresentedObject(representedObject)
- {
- if (!(representedObject instanceof WI.Resource))
- return false;
-
- return !!this.navigationSidebarPanel.contentTreeOutline.getCachedTreeElement(representedObject);
- }
-
- get supportsSplitContentBrowser()
- {
- // Since the Network tab has a real sidebar, showing the split console would cause items in
- // the sidebar to be aligned with an item in the datagrid that isn't shown.
- return false;
- }
-};
-
-WI.NetworkTabContentView.Type = "network";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (221884 => 221885)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2017-09-11 22:22:11 UTC (rev 221884)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2017-09-11 22:23:51 UTC (rev 221885)
@@ -126,7 +126,7 @@
if (options.ignoreSearchTab && tabContentView instanceof WI.SearchTabContentView)
continue;
- if (options.ignoreNetworkTab && tabContentView instanceof WI.NetworkTabContentView)
+ if (options.ignoreNetworkTab && tabContentView instanceof WI.LegacyNetworkTabContentView)
continue;
if (tabContentView.canShowRepresentedObject(representedObject))
