Changeset 267379 in webkit

Timestamp:

Sep 21, 2020, 4:09:18 PM (6 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Uncaught Exception: Missing node for given nodeId
​https://bugs.webkit.org/show_bug.cgi?id=216067
<rdar://problem/68520144>

Reviewed by Devin Rousso.

• UserInterface/Views/ContentBrowserTabContentView.js:

(WI.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels):
Rewrite showDetailsSidebarPanels in such way that causes no more than one change of selectedSidebarPanel.
Previously, removeSidebarPanel would cause the change of selectedSidebarPanel, resulting in showing
a panel with outdated this.domNode.

• UserInterface/Views/DOMNodeDetailsSidebarPanel.js:

Display a useful error with a relevant location instead of a generic Connection.js error.

• UserInterface/Views/Sidebar.js:

(WI.Sidebar.prototype.removeSidebarPanel):
After removing a panel, don't select the nearest panel. There doesn't seem to be a useful case for it.
The selected panel is determined at the removeSidebarPanel callsites.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-09-21  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Uncaught Exception: Missing node for given nodeId
+        https://bugs.webkit.org/show_bug.cgi?id=216067
+        <rdar://problem/68520144>
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Views/ContentBrowserTabContentView.js:
+        (WI.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels):
+        Rewrite `showDetailsSidebarPanels` in such way that causes no more than one change of selectedSidebarPanel.
+        Previously, `removeSidebarPanel` would cause the change of selectedSidebarPanel, resulting in showing
+        a panel with outdated `this.domNode`.
+
+        * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+        Display a useful error with a relevant location instead of a generic Connection.js error.
+
+        * UserInterface/Views/Sidebar.js:
+        (WI.Sidebar.prototype.removeSidebarPanel):
+        After removing a panel, don't select the nearest panel. There doesn't seem to be a useful case for it.
+        The selected panel is determined at the removeSidebarPanel callsites.
+
 2020-09-21  Patrick Angle  <pangle@apple.com>
 

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

@@ -178 +178 @@
 
         let hiddenSidebarPanels = 0;
+        let sidebarPanelToSelect = null;
 
         for (var i = 0; i < this.detailsSidebarPanels.length; ++i) {
@@ -193 +194 @@
                 if (this._lastSelectedDetailsSidebarPanelSetting.value === sidebarPanel.identifier) {
                     // Restore the sidebar panel selection if this sidebar panel was the last one selected by the user.
-                    WI.detailsSidebar.selectedSidebarPanel = sidebarPanel;
+                    sidebarPanelToSelect = sidebarPanel;
                 }
             } else {
@@ -202 +203 @@
         }
 
-        if (!WI.detailsSidebar.selectedSidebarPanel && WI.detailsSidebar.sidebarPanels.length)
+        if (sidebarPanelToSelect)
+            WI.detailsSidebar.selectedSidebarPanel = sidebarPanelToSelect;
+        else if (!WI.detailsSidebar.selectedSidebarPanel && WI.detailsSidebar.sidebarPanels.length)
             WI.detailsSidebar.selectedSidebarPanel = WI.detailsSidebar.sidebarPanels[0];
 

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

@@ -263 +263 @@
             const generatePreview = false;
             object.callFunction(inspectedPage_node_collectPrototypes, args, generatePreview, nodePrototypesReady.bind(this));
+        }).catch((error) => {
+            // Bail if the DOM node changed while we were waiting for the async response.
+            if (this.domNode !== domNode)
+                return;
+
+            console.assert(false, "Cannot resolve node.", error, domNode);
         });
 

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

@@ -88 +88 @@
     removeSidebarPanel(sidebarPanelOrIdentifierOrIndex)
     {
-        var sidebarPanel = this.findSidebarPanel(sidebarPanelOrIdentifierOrIndex);
+        let sidebarPanel = this.findSidebarPanel(sidebarPanelOrIdentifierOrIndex);
         if (!sidebarPanel)
             return;
@@ -96 +96 @@
 
         sidebarPanel.selected = false;
-
-        if (this._selectedSidebarPanel === sidebarPanel) {
-            var index = this._sidebarPanels.indexOf(sidebarPanel);
-            this.selectedSidebarPanel = this._sidebarPanels[index - 1] || this._sidebarPanels[index + 1] || null;
-        }
 
         this._sidebarPanels.remove(sidebarPanel);