Changeset 244282 in webkit

Timestamp:

Apr 15, 2019 12:56:59 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r244268): Canvas: navigation sidebar no longer appears
​https://bugs.webkit.org/show_bug.cgi?id=196920
<rdar://problem/49910618>

Reviewed by Timothy Hatcher.

• UserInterface/Views/ContentBrowserTabContentView.js:

(WI.ContentBrowserTabContentView.prototype.showNavigationSidebarPanel):
Now that we no longer call addSubview when adding a sidebar panel, we can't check to see
if parentSidebar has been set, as that is just an alias for parentView.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r244268): Canvas: navigation sidebar no longer appears
+        https://bugs.webkit.org/show_bug.cgi?id=196920
+        <rdar://problem/49910618>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/ContentBrowserTabContentView.js:
+        (WI.ContentBrowserTabContentView.prototype.showNavigationSidebarPanel):
+        Now that we no longer call `addSubview` when adding a sidebar panel, we can't check to see
+        if `parentSidebar` has been set, as that is just an alias for `parentView`.
+
 2019-04-15  Devin Rousso  <drousso@apple.com>
 

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

@@ -155 +155 @@
             if (!this.navigationSidebarPanel.parentSidebar)
                 WI.navigationSidebar.addSidebarPanel(this.navigationSidebarPanel);
-        } else if (this.navigationSidebarPanel.parentSidebar)
-            WI.navigationSidebar.removeSidebarPanel(this.navigationSidebarPanel);
-
-        if (this.navigationSidebarPanel.parentSidebar) {
             WI.navigationSidebar.selectedSidebarPanel = this.navigationSidebarPanel;
             WI.navigationSidebar.collapsed = this.navigationSidebarCollapsedSetting.value;
-        } else
+        } else {
             WI.navigationSidebar.collapsed = true;
+            if (this.navigationSidebarPanel.parentSidebar)
+                WI.navigationSidebar.removeSidebarPanel(this.navigationSidebarPanel);
+        }
 
         this._ignoreNavigationSidebarPanelCollapsedEvent = false;