Web Inspector: REGRESSION(r244268): Canvas: navigation sidebar no longer appears
authordrousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Apr 2019 19:56:59 +0000 (19:56 +0000)
committerdrousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Apr 2019 19:56:59 +0000 (19:56 +0000)
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`.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index b8ac3b9..793476a 100644 (file)
@@ -1,5 +1,18 @@
 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>
+
         Web Inspector: DOMDebugger: move breakpoint storage to use `WI.ObjectStore`
         https://bugs.webkit.org/show_bug.cgi?id=196231
         <rdar://problem/49236864>
index dac1bcd..54acaaf 100644 (file)
@@ -154,14 +154,13 @@ WI.ContentBrowserTabContentView = class ContentBrowserTabContentView extends WI.
         if (shouldShowSidebar) {
             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;