DevTools: migrate InspectorView to tabbed view location.

third_party/WebKit/Source/devtools/front_end/ui/InspectorView.js

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 40 matching lines @@
     this._drawerTabbedLocation.enableMoreTabsButton();
     this._drawerTabbedPane = this._drawerTabbedLocation.tabbedPane();
     this._drawerTabbedPane.setMinimumSize(0, 27);
     var closeDrawerButton = new WebInspector.ToolbarButton(WebInspector.UIString("Close drawer"), "delete-toolbar-item");
     closeDrawerButton.addEventListener("click", this.closeDrawer.bind(this));
     this._drawerTabbedPane.rightToolbar().appendToolbarItem(closeDrawerButton);
     this._drawerSplitWidget.installResizer(this._drawerTabbedPane.headerElement());
     this._drawerSplitWidget.setSidebarWidget(this._drawerTabbedPane);
 
     // Create main area tabbed pane.
-    this._tabbedPane = new WebInspector.TabbedPane();
+    this._tabbedLocation = WebInspector.viewManager.createTabbedLocation(InspectorFrontendHost.bringToFront.bind(InspectorFrontendHost), "panel", true, true);
+    this._tabbedPane = this._tabbedLocation.tabbedPane();
     this._tabbedPane.registerRequiredCSS("ui/inspectorViewTabbedPane.css");
     this._tabbedPane.setTabSlider(true);
     this._tabbedPane.setAllowTabReorder(true, false);

[dgozman, 2016/10/12 04:47:40]

Ain't this a last parameter to createTabbedLocation?

[pfeldman, 2016/10/12 19:02:33]

Done.

     this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabOrderChanged, this._persistPanelOrder, this);
+    this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
+
+    if (InspectorFrontendHost.isUnderTest())
+        this._tabbedPane.setAutoSelectFirstItemOnShow(false);
     this._tabOrderSetting = WebInspector.settings.createSetting("InspectorView.panelOrder", {});

[dgozman, 2016/10/12 04:47:40]

Remove.

[pfeldman, 2016/10/12 19:02:33]

Done.

     this._drawerSplitWidget.setMainWidget(this._tabbedPane);
 
-    this._panels = {};
-    // Used by tests.
-    WebInspector["panels"] = this._panels;
-
-    this._history = [];
-    this._historyIterator = -1;
     this._keyDownBound = this._keyDown.bind(this);
     this._keyPressBound = this._keyPress.bind(this);
-    /** @type {!Object.<string, !WebInspector.PanelDescriptor>} */
-    this._panelDescriptors = {};
     /** @type {!Object.<string, !Promise.<!WebInspector.Panel> >} */
-    this._panelPromises = {};
 
     this._lastActivePanelSetting = WebInspector.settings.createSetting("lastActivePanel", "elements");

[dgozman, 2016/10/12 04:47:40]

Unused.

[pfeldman, 2016/10/12 19:02:33]

Done.

 
     InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ShowPanel, showPanel.bind(this));
-    this._loadPanelDesciptors();
 
     /**
      * @this {WebInspector.InspectorView}
      * @param {!WebInspector.Event} event
      */
     function showPanel(event)
     {
         var panelName = /** @type {string} */ (event.data);
         this.showPanel(panelName);
     }
@@ skipping 23 matching lines @@
     /**
      * @override
      * @param {string} locationName
      * @return {?WebInspector.ViewLocation}
      */
     resolveLocation: function(locationName)
     {
         return this._drawerTabbedLocation;
     },
 
-    _loadPanelDesciptors: function()
-    {
-        /**
-         * @param {!Runtime.Extension} extension
-         * @this {!WebInspector.InspectorView}
-         */
-        function processPanelExtensions(extension)
-        {
-            var descriptor = new WebInspector.ExtensionPanelDescriptor(extension);
-            var weight = this._tabOrderSetting.get()[descriptor.name()];
-            if (weight === undefined)
-                weight = extension.descriptor()["order"];
-            if (weight === undefined)
-                weight = 10000;
-            panelWeights.set(descriptor, weight);
-        }
-
-        /**
-         * @param {!WebInspector.PanelDescriptor} left
-         * @param {!WebInspector.PanelDescriptor} right
-         */
-        function orderComparator(left, right)
-        {
-            return panelWeights.get(left) > panelWeights.get(right);
-        }
-
-        WebInspector.startBatchUpdate();
-        /** @type {!Map<!WebInspector.PanelDescriptor, number>} */
-        var panelWeights = new Map();
-        self.runtime.extensions(WebInspector.Panel).forEach(processPanelExtensions.bind(this));
-        var sortedPanels = panelWeights.keysArray().sort(orderComparator);
-        for (var panelDescriptor of sortedPanels)
-            this._innerAddPanel(panelDescriptor);
-        WebInspector.endBatchUpdate();
-    },
-
     createToolbars: function()
     {
         this._tabbedPane.leftToolbar().appendLocationItems("main-toolbar-left");
         this._tabbedPane.rightToolbar().appendLocationItems("main-toolbar-right");
     },
 
     /**
-     * @param {!WebInspector.PanelDescriptor} panelDescriptor
-     * @param {number=} index
+     * @param {!WebInspector.View} view
      */
-    _innerAddPanel: function(panelDescriptor, index)
+    addPanel: function(view)
     {
-        var panelName = panelDescriptor.name();
-        this._panelDescriptors[panelName] = panelDescriptor;
-        this._tabbedPane.appendTab(panelName, panelDescriptor.title(), new WebInspector.Widget(), undefined, undefined, undefined, index);
-        if (this._lastActivePanelSetting.get() === panelName)
-            this._tabbedPane.selectTab(panelName);
+        this._tabbedLocation.appendView(view);
     },
 
     /**
-     * @param {!WebInspector.PanelDescriptor} panelDescriptor
-     */
-    addPanel: function(panelDescriptor)
-    {
-        var weight = this._tabOrderSetting.get()[panelDescriptor.name()];
-        // Keep in sync with _persistPanelOrder().
-        if (weight)
-            weight = Math.max(0, Math.round(weight / 10) - 1);
-        this._innerAddPanel(panelDescriptor, weight);
-    },
-
-    /**
      * @param {string} panelName
      * @return {boolean}
      */
     hasPanel: function(panelName)
     {
-        return !!this._panelDescriptors[panelName];
+        return this._tabbedPane.hasTab(panelName);
     },
 
     /**
      * @param {string} panelName
      * @return {!Promise.<!WebInspector.Panel>}
      */
     panel: function(panelName)
     {
-        var panelDescriptor = this._panelDescriptors[panelName];
-        if (!panelDescriptor)
-            return Promise.reject(new Error("Can't load panel without the descriptor: " + panelName));
-
-        var promise = this._panelPromises[panelName];
-        if (promise)
-            return promise;
-
-        promise = panelDescriptor.panel();
-        this._panelPromises[panelName] = promise;
-
-        promise.then(cachePanel.bind(this));
-
-        /**
-         * @param {!WebInspector.Panel} panel
-         * @return {!WebInspector.Panel}
-         * @this {WebInspector.InspectorView}
-         */
-        function cachePanel(panel)
-        {
-            delete this._panelPromises[panelName];
-            this._panels[panelName] = panel;
-            return panel;
-        }
-        return promise;
+        return /** @type {!Promise.<!WebInspector.Panel>} */ (WebInspector.viewManager.view(panelName).widget());
     },
 
     /**
      * @param {boolean} allTargetsSuspended
      */
     onSuspendStateChanged: function(allTargetsSuspended)
     {
         this._currentPanelLocked = allTargetsSuspended;
         this._tabbedPane.setCurrentTabLocked(this._currentPanelLocked);
         this._tabbedPane.leftToolbar().setEnabled(!this._currentPanelLocked);
         this._tabbedPane.rightToolbar().setEnabled(!this._currentPanelLocked);
     },
 
     /**
+     * @return {boolean}
+     */
+    canSelectPanel: function(panelName)

[dgozman, 2016/10/12 04:47:40]

@param

[pfeldman, 2016/10/12 19:02:33]

Done.

+    {
+        return !this._currentPanelLocked || this._tabbedPane.selectedTabId === panelName;
+    },
+
+    /**
      * The returned Promise is resolved with null if another showPanel()

[dgozman, 2016/10/12 04:47:40]

This comment is no longer true.

[pfeldman, 2016/10/12 19:02:33]

Done.

      * gets called while this.panel(panelName) Promise is in flight.
      *
      * @param {string} panelName
      * @return {!Promise.<?WebInspector.Panel>}
      */
     showPanel: function(panelName)
     {
-        if (this._currentPanelLocked) {
-            if (this._currentPanel !== this._panels[panelName])
-                return Promise.reject(new Error("Current panel locked"));
-            return Promise.resolve(this._currentPanel);
-        }
-
-        this._panelForShowPromise = this.panel(panelName);
-        return this._panelForShowPromise.then(setCurrentPanelIfNecessary.bind(this, this._panelForShowPromise));
-
-        /**
-         * @param {!Promise.<!WebInspector.Panel>} panelPromise
-         * @param {!WebInspector.Panel} panel
-         * @return {?WebInspector.Panel}
-         * @this {WebInspector.InspectorView}
-         */
-        function setCurrentPanelIfNecessary(panelPromise, panel)
-        {
-            if (this._panelForShowPromise !== panelPromise)
-                return null;
-
-            this.setCurrentPanel(panel);
-            return panel;
-        }
+        return WebInspector.viewManager.showView(panelName);
     },
 
     /**
      * @param {string} panelName
      * @param {string} iconType
      * @param {string=} iconTooltip
      */
     setPanelIcon: function(panelName, iconType, iconTooltip)
     {
         this._tabbedPane.setTabIcon(panelName, iconType, iconTooltip);
     },
 
     /**
      * @return {!WebInspector.Panel}
      */
-    currentPanel: function()
+    currentPanelDeprecated: function()
     {
-        return this._currentPanel;
-    },
-
-    showInitialPanel: function()
-    {
-        if (InspectorFrontendHost.isUnderTest())
-            return;
-        this._showInitialPanel();
-    },
-
-    _showInitialPanel: function()
-    {
-        this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
-        this._tabSelected();
-    },
-
-    /**
-     * @param {string} panelName
-     */
-    showInitialPanelForTest: function(panelName)
-    {
-        this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
-        this.setCurrentPanel(this._panels[panelName]);
-    },
-
-    _tabSelected: function()
-    {
-        var panelName = this._tabbedPane.selectedTabId;
-        if (!panelName)
-            return;
-
-        this.showPanel(panelName);
-    },
-
-    /**
-     * @param {!WebInspector.Panel} panel
-     * @param {boolean=} suppressBringToFront
-     * @return {!WebInspector.Panel}
-     */
-    setCurrentPanel: function(panel, suppressBringToFront)
-    {
-        delete this._panelForShowPromise;
-
-        if (this._currentPanelLocked)
-            return this._currentPanel;
-
-        if (!suppressBringToFront)
-            InspectorFrontendHost.bringToFront();
-
-        if (this._currentPanel === panel)
-            return panel;
-
-        this._currentPanel = panel;
-        if (!this._panels[panel.name])
-            this._panels[panel.name] = panel;
-        this._tabbedPane.changeTabView(panel.name, panel);
-        this._tabbedPane.removeEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
-        this._tabbedPane.selectTab(panel.name);
-        this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
-
-        this._lastActivePanelSetting.set(panel.name);
-        this._pushToHistory(panel.name);
-        WebInspector.userMetrics.panelShown(panel.name);
-        panel.focus();
-
-        return panel;
+        return /** @type {!WebInspector.Panel} */ (WebInspector.viewManager.materializedWidget(this._tabbedPane.selectedTabId || ""));

[dgozman, 2016/10/12 04:47:40]

Why not this._tabbedPane.tabView(this._tabbedPane.selectedTabId) ? This allows
to remove ugly materializeWidget api, which is only used from this deprecated
method.

[pfeldman, 2016/10/12 19:02:33]

It would return a different widget (view's internal container). This whole
method will go since it is deprecated.

     },
 
     showDrawer: function()
     {
+        InspectorFrontendHost.bringToFront();
         if (!this._drawerTabbedPane.isShowing())
             this._drawerSplitWidget.showBoth();
         this._drawerTabbedPane.focus();
     },
 
     /**
      * @return {boolean}
      */
     drawerVisible: function()
     {
@@ skipping 64 matching lines @@
         // so for a ]/[-related keydown we delay the panel switch using a timer, to see if there is a keypress event following this one.
         // If there is, we cancel the timer and do not consider this a panel switch.
         if (!WebInspector.isWin() || (event.key !== "[" && event.key !== "]")) {
             this._keyDownInternal(event);
             return;
         }
 
         this._keyDownTimer = setTimeout(this._keyDownInternal.bind(this, event), 0);
     },
 
     _keyDownInternal: function(event)

[dgozman, 2016/10/12 04:47:40]

Seems like this method does nothing.

[pfeldman, 2016/10/12 19:02:33]

Done.

     {
         if (this._currentPanelLocked)
             return;
 
         var direction = 0;
 
         if (event.key === "[")
             direction = -1;
 
         if (event.key === "]")
             direction = 1;
 
         if (!direction)
             return;
-
-        if (!event.shiftKey && !event.altKey) {
-            if (!WebInspector.Dialog.hasInstance())
-                this._changePanelInDirection(direction);
-            event.consume(true);
-            return;
-        }
-
-        if (event.altKey && this._moveInHistory(direction))
-            event.consume(true);
-    },
-
-    /**
-     * @param {number} direction
-     */
-    _changePanelInDirection: function(direction)
-    {
-        var panelOrder = this._tabbedPane.allTabs();
-        var index = panelOrder.indexOf(this.currentPanel().name);
-        index = (index + panelOrder.length + direction) % panelOrder.length;
-        this.showPanel(panelOrder[index]);
-    },
-
-    /**
-     * @param {number} move
-     */
-    _moveInHistory: function(move)

[dgozman, 2016/10/12 04:47:40]

Dropping history! Yay!

-    {
-        var newIndex = this._historyIterator + move;
-        if (newIndex >= this._history.length || newIndex < 0)
-            return false;
-
-        this._inHistory = true;
-        this._historyIterator = newIndex;
-        if (!WebInspector.Dialog.hasInstance())
-            this.setCurrentPanel(this._panels[this._history[this._historyIterator]]);
-        delete this._inHistory;
-
-        return true;
-    },
-
-    _pushToHistory: function(panelName)
-    {
-        if (this._inHistory)
-            return;
-
-        this._history.splice(this._historyIterator + 1, this._history.length - this._historyIterator - 1);
-        if (!this._history.length || this._history[this._history.length - 1] !== panelName)
-            this._history.push(panelName);
-        this._historyIterator = this._history.length - 1;
     },
 
     onResize: function()
     {
         WebInspector.Dialog.modalHostRepositioned();
     },
 
     /**
      * @return {!Element}
      */
     topResizerElement: function()
     {
         return this._tabbedPane.headerElement();
     },
 
     toolbarItemResized: function()
     {
         this._tabbedPane.headerResized();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _persistPanelOrder: function(event)

[dgozman, 2016/10/12 04:47:40]

This is done in TabbedLocation.

[pfeldman, 2016/10/12 19:02:33]

Done.

     {
         var tabs = /** @type {!Array.<!WebInspector.TabbedPaneTab>} */(event.data);
         var tabOrders = this._tabOrderSetting.get();
         for (var i = 0; i < tabs.length; i++)
             tabOrders[tabs[i].id] = (i + 1) * 10;
         this._tabOrderSetting.set(tabOrders);
     },
 
     /**
+     * @param {!WebInspector.Event} event
+     */
+    _tabSelected: function(event)
+    {
+        var tabId = /** @type {string} */(event.data["tabId"]);
+        WebInspector.userMetrics.panelShown(tabId);
+    },
+
+    /**
      * @param {!WebInspector.SplitWidget} splitWidget
      */
     setOwnerSplit: function(splitWidget)
     {
         this._ownerSplitWidget = splitWidget;
     },
 
     minimize: function()
     {
         if (this._ownerSplitWidget)
@@ skipping 31 matching lines @@
      */
     handleAction: function(context, actionId)
     {
         if (WebInspector.inspectorView.drawerVisible())
             WebInspector.inspectorView.closeDrawer();
         else
             WebInspector.inspectorView.showDrawer();
         return true;
     }
 }