Changeset 283921 in webkit

Timestamp:

Oct 11, 2021 12:17:10 PM (9 months ago)

Author:

BJ Burg

Message:

Web Inspector: add TabBar context menu support for WI.WebInspectorExtensionTabContentView
​https://bugs.webkit.org/show_bug.cgi?id=231181
<rdar://74698241>

Unreviewed. Land parts of the previous patch which seem to have been mis-merged and not landed.

• UserInterface/Base/Main.js:

(WI.isNewTabWithTypeAllowed):

• UserInterface/Controllers/WebInspectorExtensionController.js:

(WI.WebInspectorExtensionController.prototype.showExtensionTab):

• UserInterface/Views/TabBar.js:

(WI.TabBar.prototype._handleAddClosedTabsTabBarItemMouseDown):
(WI.TabBar.prototype._handleTabContainerContextMenu):
(WI.TabBar):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Controllers/WebInspectorExtensionController.js (modified) (3 diffs)
• UserInterface/Views/TabBar.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-10-11  BJ Burg  <bburg@apple.com>
+
+        Web Inspector: add TabBar context menu support for WI.WebInspectorExtensionTabContentView
+        https://bugs.webkit.org/show_bug.cgi?id=231181
+        <rdar://74698241>
+
+        Unreviewed. Land parts of the previous patch which seem to have been mis-merged and not landed.
+
+        * UserInterface/Base/Main.js:
+        (WI.isNewTabWithTypeAllowed):
+        * UserInterface/Controllers/WebInspectorExtensionController.js:
+        (WI.WebInspectorExtensionController.prototype.showExtensionTab):
+        * UserInterface/Views/TabBar.js:
+        (WI.TabBar.prototype._handleAddClosedTabsTabBarItemMouseDown):
+        (WI.TabBar.prototype._handleTabContainerContextMenu):
+        (WI.TabBar):
+
 2021-10-11  Razvan Caliman  <rcaliman@apple.com>
 

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

@@ -743 +743 @@
 WI.isNewTabWithTypeAllowed = function(tabType)
 {
+    if (tabType === WI.WebInspectorExtensionTabContentView.Type)
+        return false;
+
     let tabClass = WI._knownTabClassesByType.get(tabType);
     if (!tabClass || !tabClass.isTabAllowed())

trunk/Source/WebInspectorUI/UserInterface/Controllers/WebInspectorExtensionController.js

@@ -161 +161 @@
     }
     
-    showExtensionTab(extensionTabID)
+    showExtensionTab(extensionTabID, options = {})
     {
         let tabContentView = this._extensionTabContentViewForExtensionTabIDMap.get(extensionTabID);
@@ -171 +171 @@
         tabContentView.visible = true;
         let success = WI.tabBrowser.showTabForContentView(tabContentView, {
+            ...options,
             initiatorHint: WI.TabBrowser.TabNavigationInitiator.FrontendAPI,
         });
@@ -178 +179 @@
             return WI.WebInspectorExtension.ErrorCode.InternalError;
         }
+
+        tabContentView.visible = true;
     }
 

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

@@ -763 +763 @@
 
         for (let closedTabClass of closedTabClasses) {
+            // Tab types that are not restorable (i.e., extension tab) should not be added in the generic code path.
+            if (!closedTabClass.shouldSaveTab())
+                continue;
+
             contextMenu.appendItem(closedTabClass.tabInfo().displayName, () => {
                 WI.createNewTabWithType(closedTabClass.Type, {shouldShowNewTab: true});
             });
         }
+
+        WI.sharedApp.extensionController.addContextMenuItemsForClosedExtensionTabs(contextMenu);
 
         contextMenu.show();
@@ -942 +948 @@
             }, checked, disabled);
         }
+
+        WI.sharedApp.extensionController.addContextMenuItemsForAllExtensionTabs(contextMenu);
     }
 };