commit d7a887d8a1a04865d621f7a09e3b9a6a8260f517
parent 9d855dda3c90039ebb65efcd9c14d90aa1675266
Author: Alexandru Marc <amarc@mozilla.com>
Date: Mon, 13 Oct 2025 17:17:02 +0300
Revert "Bug 1989056 - [devtools] Set a fixed window on WindowGlobalTarget. r=devtools-reviewers,bomsy" for causing dt failures @ browser_destroying_iframes.js
This reverts commit fb30f0ce1099a61a4d4109551459feab8912934d.
Diffstat:
5 files changed, 18 insertions(+), 50 deletions(-)
diff --git a/devtools/client/framework/test/browser.toml b/devtools/client/framework/test/browser.toml
@@ -65,8 +65,6 @@ skip-if = [
["browser_commands_from_url.js"]
-["browser_destroying_iframes.js"]
-
["browser_devtools_api_destroy.js"]
["browser_dynamic_tool_enabling.js"]
diff --git a/devtools/client/framework/test/browser_destroying_iframes.js b/devtools/client/framework/test/browser_destroying_iframes.js
@@ -1,21 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-// Testing that there's no breaking exception when destroying
-// an iframe early after its creation.
-
-add_task(async function () {
- const { tab } = await openInspectorForURL("about:blank");
- const browser = tab.linkedBrowser;
-
- // Create/remove an extra one now, after the load event.
- for (let i = 0; i < 10; i++) {
- await SpecialPowers.spawn(browser, [], async function () {
- const iframe = content.document.createElement("iframe");
- content.document.body.appendChild(iframe);
- await new Promise(res => (iframe.onload = res));
- iframe.remove();
- });
- }
-});
diff --git a/devtools/client/inspector/shared/walker-event-listener.js b/devtools/client/inspector/shared/walker-event-listener.js
@@ -60,17 +60,7 @@ class WalkerEventListener {
}
async _onTargetAvailable({ targetFront }) {
- let inspectorFront;
- try {
- inspectorFront = await targetFront.getFront("inspector");
- } catch (e) {
- // When iframes are destroyed early during their creation,
- // getFront method may throw
- if (targetFront.isDestroyed()) {
- return;
- }
- throw e;
- }
+ const inspectorFront = await targetFront.getFront("inspector");
// In case of multiple fast navigations, the front may already be destroyed,
// in such scenario bail out and ignore this short lived target.
if (inspectorFront.isDestroyed() || !this._listenerMap) {
diff --git a/devtools/server/actors/highlighters.js b/devtools/server/actors/highlighters.js
@@ -48,7 +48,7 @@ const registerHighlighter = (typeName, modulePath) => {
* CustomHighlighterActor is a generic Actor that instantiates a custom implementation of
* a highlighter class given its type name which must be registered in `highlighterTypes`.
* CustomHighlighterActor proxies calls to methods of the highlighter class instance:
- * constructor(nargetActor), show(node, options), hide(), destroy()
+ * constructor(targetActor), show(node, options), hide(), destroy()
*/
exports.CustomHighlighterActor = class CustomHighligherActor extends Actor {
/**
@@ -308,9 +308,7 @@ class HighlighterEnvironment extends EventEmitter {
if (this._targetActor && this._targetActor.isRootActor) {
return this.window;
}
- return (
- this._targetActor?.chromeEventHandler || this.docShell.chromeEventHandler
- );
+ return this.docShell && this.docShell.chromeEventHandler;
}
relayTargetEvent(name, data) {
diff --git a/devtools/server/actors/targets/window-global.js b/devtools/server/actors/targets/window-global.js
@@ -373,7 +373,7 @@ class WindowGlobalTargetActor extends BaseTargetActor {
writable: true,
});
- // When this target tracks only one WindowGlobal, set a fixed innerWindowId and window,
+ // When this target tracks only one WindowGlobal, set a fixed innerWindowId,
// so that it can easily be read safely while the related WindowGlobal is being destroyed.
if (this.followWindowGlobalLifeCycle) {
Object.defineProperty(this, "innerWindowId", {
@@ -381,16 +381,6 @@ class WindowGlobalTargetActor extends BaseTargetActor {
configurable: false,
writable: false,
});
- Object.defineProperty(this, "window", {
- value: this.window,
- configurable: false,
- writable: false,
- });
- Object.defineProperty(this, "chromeEventHandler", {
- value: this.chromeEventHandler,
- configurable: false,
- writable: false,
- });
}
// Save references to the original document we attached to
@@ -471,13 +461,26 @@ class WindowGlobalTargetActor extends BaseTargetActor {
_targetScopedActorPool = null;
/**
- * A EventTarget object on which to listen for 'DOMWindowCreated' and 'pageshow' events.
+ * An object on which listen for DOMWindowCreated and pageshow events.
*/
get chromeEventHandler() {
return getDocShellChromeEventHandler(this.docShell);
}
/**
+ * Getter for the nsIMessageManager associated to the window global.
+ */
+ get messageManager() {
+ try {
+ return this.docShell.messageManager;
+ } catch (e) {
+ // In some cases we can't get a docshell. We just have no message manager
+ // then,
+ return null;
+ }
+ }
+
+ /**
* Getter for the list of all `docShell`s in the window global.
* @return {Array}
*/
