Bug 1702714 - GetBrowserBridgeParent may be null after destroy, r=farre

Differential Revision: https://phabricator.services.mozilla.com/D110827
2021-04-09 17:10:18 +00:00
parent 308ec876b4
commit 34dbc2a4ae
1 changed files with 2 additions and 1 deletions
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
@@ -1271,7 +1271,8 @@ nsresult CanonicalBrowsingContext::PendingRemotenessChange::FinishSubframe() {
  bool wasRemote = oldBrowser && oldBrowser->GetBrowsingContext() == target;
  if (wasRemote) {
    MOZ_DIAGNOSTIC_ASSERT(oldBrowser != embedderBrowser);
-    MOZ_DIAGNOSTIC_ASSERT(oldBrowser->GetBrowserBridgeParent());
+    MOZ_DIAGNOSTIC_ASSERT(oldBrowser->IsDestroyed() ||
+                          oldBrowser->GetBrowserBridgeParent());

    // `oldBrowser` will clear the `UnloadingHost` status once the actor has
    // been destroyed.