Bug 1741808 - [devtools] Fix increased failures on browser_toolbox_ba…

…ckward_forward_navigation.js when EFT is enabled. r=ochameau. Differential Revision: https://phabricator.services.mozilla.com/D131475
iaxat · Nov 18, 2021 · 879b191 · 879b191
1 parent 2ced36b
commit 879b191
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js
@@ -1442,6 +1442,7 @@ MarkupView.prototype = {
   _onResourceAvailable: async function(resources) {
     for (const resource of resources) {
       if (
+        !this.resourceCommand ||
         resource.resourceType !== this.resourceCommand.TYPES.ROOT_NODE ||
         resource.isDestroyed()
       ) {

diff --git a/devtools/client/inspector/shared/walker-event-listener.js b/devtools/client/inspector/shared/walker-event-listener.js
@@ -63,7 +63,7 @@ class WalkerEventListener {
     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()) {
+    if (inspectorFront.isDestroyed() || !this._listenerMap) {
       return;
     }
     const { walker } = inspectorFront;