Title: [251853] trunk/Source/WebInspectorUI
- Revision
- 251853
- Author
- yu...@chromium.org
- Date
- 2019-10-31 10:18:18 -0700 (Thu, 31 Oct 2019)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (251852 => 251853)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-10-31 16:14:03 UTC (rev 251852)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-10-31 17:18:18 UTC (rev 251853)
@@ -1,3 +1,18 @@
+2019-10-31 Yury Semikhatsky <yu...@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 <yu...@chromium.org>
Web Inspector: track WI.Script unique display name numbers per Page target
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (251852 => 251853)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2019-10-31 16:14:03 UTC (rev 251852)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2019-10-31 17:18:18 UTC (rev 251853)
@@ -173,8 +173,7 @@
return;
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
// changes are recorded in _lastSelectedDetailsSidebarPanelSetting.
@@ -186,7 +185,7 @@
for (var i = 0; i < this.detailsSidebarPanels.length; ++i) {
var sidebarPanel = this.detailsSidebarPanels[i];
if (sidebarPanel.inspect(currentRepresentedObjects)) {
- if (currentSidebarPanels.includes(sidebarPanel)) {
+ if (WI.detailsSidebar.sidebarPanels.includes(sidebarPanel)) {
// Already showing the panel.
continue;
}
@@ -206,8 +205,8 @@
}
}
- 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)
WI.detailsSidebar.collapsed = true;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js (251852 => 251853)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2019-10-31 16:14:03 UTC (rev 251852)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2019-10-31 17:18:18 UTC (rev 251853)
@@ -136,8 +136,10 @@
if (this._selectedSidebarPanel) {
this.addSubview(this._selectedSidebarPanel);
this._selectedSidebarPanel.selected = true;
- this._selectedSidebarPanel.shown();
- this._selectedSidebarPanel.visibilityDidChange();
+ if (!this.collapsed) {
+ this._selectedSidebarPanel.shown();
+ this._selectedSidebarPanel.visibilityDidChange();
+ }
}
this.dispatchEventToListeners(WI.Sidebar.Event.SidebarPanelSelected);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
