Changeset 224508 in webkit

Timestamp:

Nov 6, 2017 1:08:01 PM (6 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: no way to navigate from Resource tree element to its entry in Network Tab
​https://bugs.webkit.org/show_bug.cgi?id=179328
<rdar://problem/35367294>

Reviewed by Brian Burg.

• Localizations/en.lproj/localizedStrings.js:

New reveal in network tab string.

• UserInterface/Base/Main.js:

(WI.isShowingNetworkTab):
Utility to know if the network tab is showing.

• UserInterface/Views/ContextMenuUtilities.js:

(WI.appendContextMenuItemsForSourceCode):
(showResourceWithOptions):
(WI.appendContextMenuItemsForURL):
Generalize context menus for just a URL.

• UserInterface/Views/TabBrowser.js:

(WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
Support more tab ignore options, this is starting to get icky. We may want to
move to just a preferredTab approach, since that is what some of these want.

• UserInterface/Views/DOMTreeElement.js:

(WI.DOMTreeElement.prototype._populateTagContextMenu):
Make use of new ContextMenu utility to add menu items for a URL.

• UserInterface/Views/NetworkTabContentView.js:

(WI.NetworkTabContentView.prototype.showRepresentedObject):

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView.prototype.showRepresentedObject):
Handle showing a Resource in the NetworkTab. We immediately show
the details view for it, otherwise we fallback to the list view.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Views/ContextMenuUtilities.js (modified) (2 diffs)
• UserInterface/Views/DOMTreeElement.js (modified) (1 diff)
• UserInterface/Views/NetworkTabContentView.js (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (1 diff)
• UserInterface/Views/TabBrowser.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-11-06  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: no way to navigate from Resource tree element to its entry in Network Tab
+        https://bugs.webkit.org/show_bug.cgi?id=179328
+        <rdar://problem/35367294>
+
+        Reviewed by Brian Burg.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        New reveal in network tab string.
+
+        * UserInterface/Base/Main.js:
+        (WI.isShowingNetworkTab):
+        Utility to know if the network tab is showing.
+
+        * UserInterface/Views/ContextMenuUtilities.js:
+        (WI.appendContextMenuItemsForSourceCode):
+        (showResourceWithOptions):
+        (WI.appendContextMenuItemsForURL):
+        Generalize context menus for just a URL.
+
+        * UserInterface/Views/TabBrowser.js:
+        (WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
+        Support more tab ignore options, this is starting to get icky. We may want to
+        move to just a preferredTab approach, since that is what some of these want.
+
+        * UserInterface/Views/DOMTreeElement.js:
+        (WI.DOMTreeElement.prototype._populateTagContextMenu):
+        Make use of new ContextMenu utility to add menu items for a URL.
+
+        * UserInterface/Views/NetworkTabContentView.js:
+        (WI.NetworkTabContentView.prototype.showRepresentedObject):
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype.showRepresentedObject):
+        Handle showing a Resource in the NetworkTab. We immediately show
+        the details view for it, otherwise we fallback to the list view.
+
 2017-11-06  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -780 +780 @@
 localizedStrings["Reveal in Debugger Tab"] = "Reveal in Debugger Tab";
 localizedStrings["Reveal in Elements Tab"] = "Reveal in Elements Tab";
+localizedStrings["Reveal in Network Tab"] = "Reveal in Network Tab";
 localizedStrings["Reveal in Original Resource"] = "Reveal in Original Resource";
 localizedStrings["Reveal in Resources Tab"] = "Reveal in Resources Tab";

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

@@ -994 +994 @@
 };
 
+WI.isShowingNetworkTab = function()
+{
+    return this.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView;
+};
+
 WI.showTimelineTab = function()
 {

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

@@ -43 +43 @@
     contextMenu.appendSeparator();
 
-    if (sourceCode.url) {
-        contextMenu.appendItem(WI.UIString("Open in New Tab"), () => {
-            const frame = null;
-            WI.openURL(sourceCode.url, frame, {alwaysOpenExternally: true});
-        });
-
-        if (WI.frameResourceManager.resourceForURL(sourceCode.url) && !WI.isShowingResourcesTab()) {
-            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
-                const options = {ignoreNetworkTab: true};
-                if (location)
-                    WI.showSourceCodeLocation(location, options);
-                else
-                    WI.showSourceCode(sourceCode, options);
-            });
-        }
-
-        contextMenu.appendItem(WI.UIString("Copy Link Address"), () => {
-            InspectorFrontendHost.copyText(sourceCode.url);
-        });
-    }
+    WI.appendContextMenuItemsForURL(contextMenu, sourceCode.url, {sourceCode, location});
 
     if (sourceCode instanceof WI.Resource) {
@@ -98 +79 @@
         contextMenu.appendSeparator();
     }
+};
+
+WI.appendContextMenuItemsForURL = function(contextMenu, url, options)
+{
+    if (!url)
+        return;
+
+    let {sourceCode, location, frame} = options;
+    function showResourceWithOptions(options) {
+        if (location)
+            WI.showSourceCodeLocation(location, options);
+        else if (sourceCode)
+            WI.showSourceCode(sourceCode, options);
+        else
+            WI.openURL(url, frame, options);
+    }
+
+    contextMenu.appendItem(WI.UIString("Open in New Tab"), () => {
+        const frame = null;
+        WI.openURL(url, frame, {alwaysOpenExternally: true});
+    });
+
+    if (WI.frameResourceManager.resourceForURL(url)) {
+        if (!WI.isShowingResourcesTab()) {
+            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
+                showResourceWithOptions({ignoreNetworkTab: true, ignoreSearchTab: true});
+            });
+        }
+        if (!WI.isShowingNetworkTab()) {
+            contextMenu.appendItem(WI.UIString("Reveal in Network Tab"), () => {
+                showResourceWithOptions({ignoreResourcesTab: true, ignoreDebuggerTab: true, ignoreSearchTab: true});
+            });
+        }
+    }
+
+    contextMenu.appendItem(WI.UIString("Copy Link Address"), () => {
+        InspectorFrontendHost.copyText(sourceCode.url);
+    });
 };
 

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

@@ -740 +740 @@
         if (event.target && event.target.tagName === "A") {
             let url = event.target.href;
-
-            contextMenu.appendItem(WI.UIString("Open in New Tab"), () => {
-                const frame = null;
-                WI.openURL(url, frame, {alwaysOpenExternally: true});
-            });
-
-            if (WI.frameResourceManager.resourceForURL(url)) {
-                contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
-                    let frame = WI.frameResourceManager.frameForIdentifier(node.frameIdentifier);
-
-                    const options = {
-                        ignoreNetworkTab: true,
-                        ignoreSearchTab: true,
-                    };
-                    WI.openURL(url, frame, options);
-                });
-            }
-
-            contextMenu.appendItem(WI.UIString("Copy Link Address"), () => {
-                InspectorFrontendHost.copyText(url);
-            });
+            let frame = WI.frameResourceManager.frameForIdentifier(node.frameIdentifier);
+            WI.appendContextMenuItemsForURL(contextMenu, url, {frame});
         }
 

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

@@ -99 +99 @@
     }
 
+    showRepresentedObject(representedObject, cookie)
+    {
+        console.assert(this._contentBrowser.currentContentView === this._networkTableContentView);
+        this._networkTableContentView.showRepresentedObject(representedObject, cookie);
+    }
+
     get supportsSplitContentBrowser()
     {

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

@@ -257 +257 @@
     }
 
+    showRepresentedObject(representedObject, cookie)
+    {
+        console.assert(representedObject instanceof WI.Resource);
+
+        let rowIndex = this._rowIndexForResource(representedObject);
+        if (rowIndex === -1) {
+            this._selectedResource = null;
+            this._table.clearSelectedRow();
+            this._hideResourceDetailView();
+            return;
+        }
+   
+        this._table.selectRow(rowIndex);
+    }
+
     // NetworkResourceDetailView delegate
 

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

@@ -130 +130 @@
                 continue;
 
+            if (options.ignoreResourcesTab && tabContentView instanceof WI.ResourcesTabContentView)
+                continue;
+
+            if (options.ignoreDebuggerTab && tabContentView instanceof WI.DebuggerTabContentView)
+                continue;
+
             if (tabContentView.canShowRepresentedObject(representedObject))
                 return tabContentView;