Changeset 251853 in webkit

Timestamp:

Oct 31, 2019 10:18:18 AM (5 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: CONSOLE ERROR Shown panel style-rules must be visible
​https://bugs.webkit.org/show_bug.cgi?id=203377

Reviewed by Devin Rousso.

Fix assertion failure when opening elements panel with hidden details sidebar.

• UserInterface/Views/ContentBrowserTabContentView.js:

(WI.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels):

• UserInterface/Views/Sidebar.js:

(WI.Sidebar.prototype.set selectedSidebarPanel): Only call shown() if the Sidebar
is not collapsed. It will anyway be called when the Sidebar is expanded.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ContentBrowserTabContentView.js (modified) (3 diffs)
• UserInterface/Views/Sidebar.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-10-31  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: CONSOLE ERROR Shown panel style-rules must be visible
+        https://bugs.webkit.org/show_bug.cgi?id=203377
+
+        Reviewed by Devin Rousso.
+
+        Fix assertion failure when opening elements panel with hidden details sidebar.
+
+        * UserInterface/Views/ContentBrowserTabContentView.js:
+        (WI.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels):
+        * UserInterface/Views/Sidebar.js:
+        (WI.Sidebar.prototype.set selectedSidebarPanel): Only call shown() if the Sidebar
+        is not collapsed. It will anyway be called when the Sidebar is expanded.
+
 2019-10-30  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -174 +174 @@
 
         var currentRepresentedObjects = this._contentBrowser.currentRepresentedObjects;
-        var currentSidebarPanels = WI.detailsSidebar.sidebarPanels;
-        var wasSidebarEmpty = !currentSidebarPanels.length;
+        var wasSidebarEmpty = !WI.detailsSidebar.sidebarPanels.length;
 
         // Ignore any changes to the selected sidebar panel during this function so only user initiated
@@ -187 +186 @@
             var sidebarPanel = this.detailsSidebarPanels[i];
             if (sidebarPanel.inspect(currentRepresentedObjects)) {
-                if (currentSidebarPanels.includes(sidebarPanel)) {
+                if (WI.detailsSidebar.sidebarPanels.includes(sidebarPanel)) {
                     // Already showing the panel.
                     continue;
@@ -207 +206 @@
         }
 
-        if (!WI.detailsSidebar.selectedSidebarPanel && currentSidebarPanels.length)
-            WI.detailsSidebar.selectedSidebarPanel = currentSidebarPanels[0];
+        if (!WI.detailsSidebar.selectedSidebarPanel && WI.detailsSidebar.sidebarPanels.length)
+            WI.detailsSidebar.selectedSidebarPanel = WI.detailsSidebar.sidebarPanels[0];
 
         if (!WI.detailsSidebar.sidebarPanels.length)

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

@@ -137 +137 @@
             this.addSubview(this._selectedSidebarPanel);
             this._selectedSidebarPanel.selected = true;
-            this._selectedSidebarPanel.shown();
-            this._selectedSidebarPanel.visibilityDidChange();
+            if (!this.collapsed) {
+                this._selectedSidebarPanel.shown();
+                this._selectedSidebarPanel.visibilityDidChange();
+            }
         }