Bug 1544372 - part1: sort webextension actor objects alphabetically (tidying) r=Ola
authorJulian Descottes <jdescottes@mozilla.com>
Fri, 26 Apr 2019 13:57:04 +0000
changeset 471482 c33e07c9d8211a19e24324a60ffec05459b7b849
parent 471481 31e2f80bc00d283bb65c16d3938f7bdb087018e2
child 471483 26048370172d6a7635f33dab067b4eb88954b14f
push id35920
push useraiakab@mozilla.com
push dateFri, 26 Apr 2019 22:02:33 +0000
treeherdermozilla-central@b13f2b24ae62 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersOla
bugs1544372
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1544372 - part1: sort webextension actor objects alphabetically (tidying) r=Ola Differential Revision: https://phabricator.services.mozilla.com/D28629
devtools/server/actors/addon/webextension.js
--- a/devtools/server/actors/addon/webextension.js
+++ b/devtools/server/actors/addon/webextension.js
@@ -65,48 +65,48 @@ const WebExtensionActor = protocol.Actor
       return {};
     });
   },
 
   form() {
     const policy = ExtensionParent.WebExtensionPolicy.getByID(this.addonId);
     return {
       actor: this.actorID,
-      id: this.addonId,
-      name: this.addon.name,
-      url: this.addon.sourceURI ? this.addon.sourceURI.spec : undefined,
+      debuggable: this.addon.isDebuggable,
       // iconDataURL is available after calling loadIconDataURL
       iconDataURL: this._iconDataURL,
       iconURL: this.addon.iconURL,
+      id: this.addonId,
+      isAPIExtension: this.addon.isAPIExtension,
       isSystem: this.addon.isSystem,
-      debuggable: this.addon.isDebuggable,
+      isWebExtension: this.addon.isWebExtension,
+      manifestURL: policy && policy.getURL("manifest.json"),
+      name: this.addon.name,
       temporarilyInstalled: this.addon.temporarilyInstalled,
       type: this.addon.type,
-      isWebExtension: this.addon.isWebExtension,
-      isAPIExtension: this.addon.isAPIExtension,
-      manifestURL: policy && policy.getURL("manifest.json"),
+      url: this.addon.sourceURI ? this.addon.sourceURI.spec : undefined,
       warnings: ExtensionParent.DebugUtils.getExtensionManifestWarnings(this.addonId),
     };
   },
 
   connect() {
     if (this._childFormPormise) {
       return this._childFormPromise;
     }
 
     const proxy = new WebExtensionTargetActorProxy(this.conn, this);
     this._childFormPromise = proxy.connect().then(form => {
       // Merge into the child actor form, some addon metadata
       // (e.g. the addon name shown in the addon debugger window title).
       return Object.assign(form, {
+        iconURL: this.addon.iconURL,
         id: this.addon.id,
-        name: this.addon.name,
-        iconURL: this.addon.iconURL,
         // Set the isOOP attribute on the connected child actor form.
         isOOP: proxy.isOOP,
+        name: this.addon.name,
       });
     });
     this._destroyProxy = () => proxy.destroy();
 
     return this._childFormPromise;
   },
 
   // This function will be called from RootActor in case that the debugger client