From 1aac59224c4fd626a9f7d85cafaaed2e2a573038 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Wed, 9 Dec 2020 13:16:48 +0000
Subject: [PATCH] Bug 1680218 - [devtools] Remove supportsNodePicker trait.
 r=rcaliman.

The trait was introduced in Firefox 80, so it's
safe to remove it now.

Differential Revision: https://phabricator.services.mozilla.com/D98487
---
 devtools/client/fronts/walker.js           | 18 ++----------------
 devtools/server/actors/inspector/walker.js |  2 --
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/devtools/client/fronts/walker.js b/devtools/client/fronts/walker.js
index 4225ab4aca83..331245658838 100644
--- a/devtools/client/fronts/walker.js
+++ b/devtools/client/fronts/walker.js
@@ -583,16 +583,8 @@ class WalkerFront extends FrontClassWithSpec(walkerSpec) {
     if (this._isPicking) {
       return Promise.resolve();
     }
+
     this._isPicking = true;
-
-    // @backward-compat { version 80 } On older server, walker.pick doesn't exist.
-    if (!this.traits.supportsNodePicker) {
-      // parent is InspectorFront
-      return doFocus
-        ? this.parentFront.highlighter.pickAndFocus()
-        : this.parentFront.highlighter.pick();
-    }
-
     return super.pick(doFocus);
   }
 
@@ -603,14 +595,8 @@ class WalkerFront extends FrontClassWithSpec(walkerSpec) {
     if (!this._isPicking) {
       return Promise.resolve();
     }
+
     this._isPicking = false;
-
-    // @backward-compat { version 80 } On older server, walker.cancelPick doesn't exist.
-    if (!this.traits.supportsNodePicker) {
-      // parent is InspectorFront
-      return this.parentFront.highlighter.cancelPick();
-    }
-
     return super.cancelPick();
   }
 }
diff --git a/devtools/server/actors/inspector/walker.js b/devtools/server/actors/inspector/walker.js
index d05a98efff1a..7b4135b08b53 100644
--- a/devtools/server/actors/inspector/walker.js
+++ b/devtools/server/actors/inspector/walker.js
@@ -321,8 +321,6 @@ var WalkerActor = protocol.ActorClassWithSpec(walkerSpec, {
       actor: this.actorID,
       root: this.rootNode.form(),
       traits: {
-        // @backward-compat { version 80 } Walker implements node picker
-        supportsNodePicker: true,
         // @backward-compat { version 83 } Walker implements overflow debugging support
         supportsOverflowDebugging2: true,
       },