Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/devtools/server/actors/targets/webextension.js b/devtools/server/actors/targets/webextension.js
index c717b53011..47127dc65c 100644
--- a/devtools/server/actors/targets/webextension.js
+++ b/devtools/server/actors/targets/webextension.js
@@ -162,6 +162,12 @@ class WebExtensionTargetActor extends ParentProcessTargetActor {
     // URL shown in the window tittle when the addon debugger is opened).
     const extensionWindow = this._searchForExtensionWindow();
     this.setDocShell(extensionWindow.docShell);
+
+    // `setDocShell` will force the instantiation of the thread actor.
+    // We now have to initialize it in order to listen for new global
+    // which allows to properly detect addon reload via _shouldAddNewGlobalAsDebuggee
+    // which may call _onNewExtensionWindow.
+    this.threadActor.attach({});
   }
 
   // Override the ParentProcessTargetActor's override in order to only iterate