diff --git a/devtools/client/fronts/root.js b/devtools/client/fronts/root.js index 875dae5a0465..0edbe8f8c9e0 100644 --- a/devtools/client/fronts/root.js +++ b/devtools/client/fronts/root.js @@ -212,21 +212,6 @@ class RootFront extends FrontClassWithSpec(rootSpec) { return this.getProcess(0); } - /** - * Retrieve the target descriptor for the provided id. - * - * @return {ProcessDescriptorFront} the process descriptor front for the - * provided id. - */ - async getProcess(id) { - const { form, processDescriptor } = await super.getProcess(id); - // Backward compatibility: FF74 or older servers will return the - // process descriptor as the "form" property of the response. - // Once FF75 is merged to release we can always expect `processDescriptor` - // to be defined. - return processDescriptor || form; - } - /** * Override default listTabs request in order to return a list of * BrowsingContextTargetFronts while updating their selected state. diff --git a/devtools/server/actors/root.js b/devtools/server/actors/root.js index 560af318b6a6..8ab3d3e6a979 100644 --- a/devtools/server/actors/root.js +++ b/devtools/server/actors/root.js @@ -578,7 +578,7 @@ exports.RootActor = protocol.ActorClassWithSpec(rootSpec, { processDescriptor = new ProcessDescriptorActor(this.conn, options); this._processDescriptorActorPool.manage(processDescriptor); } - return { processDescriptor }; + return processDescriptor; }, /** diff --git a/devtools/shared/specs/root.js b/devtools/shared/specs/root.js index c7a2ad4913e7..70c500b8e93f 100644 --- a/devtools/shared/specs/root.js +++ b/devtools/shared/specs/root.js @@ -20,14 +20,6 @@ types.addDictType("root.listServiceWorkerRegistrations", { types.addDictType("root.listRemoteFrames", { frames: "array:frameDescriptor", }); -// Backward compatibility: FF74 or older servers will return the -// process descriptor as the "form" property of the response. -// Once FF75 is merged to release we can always expect `processDescriptor` -// to be defined. -types.addDictType("root.getProcess", { - form: "nullable:processDescriptor", - processDescriptor: "nullable:processDescriptor", -}); types.addDictType("root.listTabs", { // Backwards compatibility for servers FF74 and before // once FF75 is merged into release, we can return tabDescriptors directly. @@ -108,7 +100,9 @@ const rootSpecPrototype = { request: { id: Arg(0, "number"), }, - response: RetVal("root.getProcess"), + response: { + processDescriptor: RetVal("processDescriptor"), + }, }, listRemoteFrames: {