Bug 1533679 - Move targets modules to a dedicated targets folder. r=ato
authorAlexandre Poirot <poirot.alex@gmail.com>
Sun, 10 Mar 2019 12:50:57 +0000
changeset 524277 886ef9f05fa352aee3742d82853e42891b1b5c52
parent 524276 6e5c72c4c88410fcb1ce081761d7edb1e925489a
child 524278 1dc639610f3b175d1cf3790469d1a4a571191199
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1533679
milestone67.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 1533679 - Move targets modules to a dedicated targets folder. r=ato This is going to help introduce multiple kind of targets. Depends on D22685 Differential Revision: https://phabricator.services.mozilla.com/D22686
remote/RemoteAgent.js
remote/Target.jsm
remote/Targets.jsm
remote/jar.mn
remote/targets/Target.jsm
remote/targets/Targets.jsm
--- a/remote/RemoteAgent.js
+++ b/remote/RemoteAgent.js
@@ -12,17 +12,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
   HttpServer: "chrome://remote/content/server/HTTPD.jsm",
   JSONHandler: "chrome://remote/content/JSONHandler.jsm",
   Log: "chrome://remote/content/Log.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   Observer: "chrome://remote/content/Observer.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
   RecommendedPreferences: "chrome://remote/content/RecommendedPreferences.jsm",
   TabObserver: "chrome://remote/content/WindowManager.jsm",
-  Targets: "chrome://remote/content/Targets.jsm",
+  Targets: "chrome://remote/content/targets/Targets.jsm",
 });
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 
 const ENABLED = "remote.enabled";
 const FORCE_LOCAL = "remote.force-local";
 
 const DEFAULT_HOST = "localhost";
 const DEFAULT_PORT = 9222;
--- a/remote/jar.mn
+++ b/remote/jar.mn
@@ -9,23 +9,25 @@ remote.jar:
   content/Error.jsm (Error.jsm)
   content/JSONHandler.jsm (JSONHandler.jsm)
   content/Log.jsm (Log.jsm)
   content/Observer.jsm (Observer.jsm)
   content/Protocol.jsm (Protocol.jsm)
   content/RecommendedPreferences.jsm (RecommendedPreferences.jsm)
   content/Session.jsm (Session.jsm)
   content/Sync.jsm (Sync.jsm)
-  content/Target.jsm (Target.jsm)
-  content/Targets.jsm (Targets.jsm)
   content/WindowManager.jsm (WindowManager.jsm)
 
   # Frame scripts
   content/frame-script.js (frame-script.js)
 
+  # targets
+  content/targets/Target.jsm (targets/Target.jsm)
+  content/targets/Targets.jsm (targets/Targets.jsm)
+
   # domains
   content/domains/Domain.jsm (domains/Domain.jsm)
   content/domains/Domains.jsm (domains/Domains.jsm)
   content/domains/ContentProcessDomains.jsm (domains/ContentProcessDomains.jsm)
   content/domains/ParentProcessDomains.jsm (domains/ParentProcessDomains.jsm)
   content/domains/content/Log.jsm (domains/content/Log.jsm)
   content/domains/content/Page.jsm (domains/content/Page.jsm)
   content/domains/parent/Browser.jsm (domains/parent/Browser.jsm)
rename from remote/Target.jsm
rename to remote/targets/Target.jsm
rename from remote/Targets.jsm
rename to remote/targets/Targets.jsm
--- a/remote/Targets.jsm
+++ b/remote/targets/Targets.jsm
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 var EXPORTED_SYMBOLS = ["Targets"];
 
 const {EventEmitter} = ChromeUtils.import("resource://gre/modules/EventEmitter.jsm");
 const {MessagePromise} = ChromeUtils.import("chrome://remote/content/Sync.jsm");
-const {Target} = ChromeUtils.import("chrome://remote/content/Target.jsm");
+const {Target} = ChromeUtils.import("chrome://remote/content/targets/Target.jsm");
 
 class Targets {
   constructor() {
     // browser context ID -> Target<XULElement>
     this._targets = new Map();
 
     EventEmitter.decorate(this);
   }