Changeset 287346 in webkit

Timestamp:

Dec 21, 2021, 9:17:13 PM (5 years ago)

Author:

Patrick Angle

Message:

Web Inspector: Assertion Failed removing subview in ContentViewContainer.prototype._disassociateFromContentView
​https://bugs.webkit.org/show_bug.cgi?id=234572

Reviewed by Devin Rousso.

r283859 accidentally removed the checks that a content view is attached before attempting to remove it, leading
to an assertion.

• UserInterface/Views/ContentViewContainer.js:

(WI.ContentViewContainer.prototype._disassociateFromContentView):

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-12-21  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Assertion Failed removing subview in ContentViewContainer.prototype._disassociateFromContentView
+        https://bugs.webkit.org/show_bug.cgi?id=234572
+
+        Reviewed by Devin Rousso.
+
+        r283859 accidentally removed the checks that a content view is attached before attempting to remove it, leading
+        to an assertion.
+
+        * UserInterface/Views/ContentViewContainer.js:
+        (WI.ContentViewContainer.prototype._disassociateFromContentView):
+
 2021-12-21  Patrick Angle  <pangle@apple.com>
 

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

@@ -422 +422 @@
         }
 
-        // Hidden/non-visible extension tabs must remain attached to the DOM to avoid reloading.
-        if (contentView.constructor.shouldNotRemoveFromDOMWhenHidden() && !contentView.visible)
-            return;
-
-        this.removeSubview(contentView);
+        if (contentView.constructor.shouldNotRemoveFromDOMWhenHidden()) {
+            // Hidden/non-visible extension tabs must remain attached to the DOM to avoid reloading.
+            if (!contentView.visible)
+                return;
+
+            if (contentView.isAttached)
+                this.removeSubview(contentView);
+        }
 
         console.assert(!contentView.isAttached);