Merging upstream version 126.0.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/toolkit/components/extensions/ConduitsParent.sys.mjs b/toolkit/components/extensions/ConduitsParent.sys.mjs
index d90bc4afd7..afd81cafc2 100644
--- a/toolkit/components/extensions/ConduitsParent.sys.mjs
+++ b/toolkit/components/extensions/ConduitsParent.sys.mjs
@@ -29,6 +29,7 @@
  * @property {string} [url]
  * @property {number} [frameId]
  * @property {string} [workerScriptURL]
+ * @property {number} [workerDescriptorId]
  * @property {string} [extensionId]
  * @property {string} [envType]
  * @property {string} [instanceId]
@@ -299,7 +300,7 @@ export class BroadcastConduit extends BaseConduit {
     if (method === "RunListener" && arg.path.startsWith("webRequest.")) {
       return actor.batch(method, { target, arg, query, sender });
     }
-    return super._send(method, query, actor, { target, arg, query, sender });
+    return super._doSend(method, query, actor, { target, arg, query, sender });
   }
 
   /**
@@ -482,6 +483,5 @@ export class ConduitsParent extends JSWindowActorParent {
  */
 export class ProcessConduitsParent extends JSProcessActorParent {
   receiveMessage = ConduitsParent.prototype.receiveMessage;
-  willDestroy = ConduitsParent.prototype.willDestroy;
   didDestroy = ConduitsParent.prototype.didDestroy;
 }