From 5fc6358573475e17899b9a6ac5aa8b68e0c514ff Mon Sep 17 00:00:00 2001 From: Nicolas Chevobbe Date: Fri, 11 Dec 2020 13:54:13 +0000 Subject: [PATCH] Bug 1680440 - [devtools] Remove hasTabInfo trait on Tab descriptor. r=ladybenko. The trait was added in 77, so we can safely remove it now. Differential Revision: https://phabricator.services.mozilla.com/D98727 --- .../browser_aboutdebugging_addons_remote_runtime.js | 1 - ...browser_aboutdebugging_workers_remote_runtime.js | 1 - .../browser/mocks/helper-client-wrapper-mock.js | 1 - devtools/client/fronts/descriptors/tab.js | 13 ------------- devtools/server/actors/descriptors/tab.js | 3 --- devtools/server/tests/xpcshell/testactors.js | 1 - 6 files changed, 20 deletions(-) diff --git a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js index 8b44b0de40e8..95c40170cd70 100644 --- a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js +++ b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js @@ -122,7 +122,6 @@ async function testAddonsOnMockedRemoteClient( outerWindowID: 0, traits: { getFavicon: true, - hasTabInfo: true, }, url: "http://some.random/url.com", }; diff --git a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js index b0d3beb9048a..839e0a2322b1 100644 --- a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js +++ b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js @@ -140,7 +140,6 @@ async function testWorkerOnMockedRemoteClient( outerWindowID: 0, traits: { getFavicon: true, - hasTabInfo: true, }, url: "http://some.random/url.com", }; diff --git a/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js b/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js index 547471f77209..58f9ec38e905 100644 --- a/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js +++ b/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js @@ -118,7 +118,6 @@ function createThisFirefoxClientMock() { outerWindowID: 0, traits: { getFavicon: true, - hasTabInfo: true, }, url: "about:debugging", }; diff --git a/devtools/client/fronts/descriptors/tab.js b/devtools/client/fronts/descriptors/tab.js index 900fb3268492..18f569f2c4e9 100644 --- a/devtools/client/fronts/descriptors/tab.js +++ b/devtools/client/fronts/descriptors/tab.js @@ -156,19 +156,6 @@ class TabDescriptorFront extends FrontClassWithSpec(tabDescriptorSpec) { */ async retrieveAsyncFormData() { try { - if (!this.traits.hasTabInfo) { - // @backward-compat { version 77 } - const targetForm = await super.getTarget(); - this._form.outerWindowID = targetForm.outerWindowID; - this._form.title = targetForm.title; - this._form.url = targetForm.url; - - if (!this.traits.getFavicon) { - // @backward-compat { version 76 } - this._form.favicon = targetForm.favicon; - } - } - if (this.traits.getFavicon) { this._form.favicon = await this.getFavicon(); } diff --git a/devtools/server/actors/descriptors/tab.js b/devtools/server/actors/descriptors/tab.js index b27f967b51b3..e786aafaae3b 100644 --- a/devtools/server/actors/descriptors/tab.js +++ b/devtools/server/actors/descriptors/tab.js @@ -62,9 +62,6 @@ const TabDescriptorActor = ActorClassWithSpec(tabDescriptorSpec, { traits: { // @backward-compat { version 76 } getFavicon: true, - // @backward-compat { version 77 } This trait indicates that meta data such as - // title, url and outerWindowID are directly available on the TabDescriptor. - hasTabInfo: true, // @backward-compat { version 77 } watcher: true, }, diff --git a/devtools/server/tests/xpcshell/testactors.js b/devtools/server/tests/xpcshell/testactors.js index cfb0cdfa1b12..02aa92296685 100644 --- a/devtools/server/tests/xpcshell/testactors.js +++ b/devtools/server/tests/xpcshell/testactors.js @@ -130,7 +130,6 @@ const TestDescriptorActor = protocol.ActorClassWithSpec(tabDescriptorSpec, { actor: this.actorID, traits: { getFavicon: true, - hasTabInfo: true, }, selected: this.selected, title: this._targetActor.title,