Bug 951609 - Fix scope issues in child.js. r=ochameau
authorPaul Rouget <paul@mozilla.com>
Wed, 18 Dec 2013 13:18:25 -0500
changeset 161102 34e88cb414cd346e32c81f062cc993aa7a308df6
parent 161101 bdceb89107dbdfbe48dd3bf78158fb028cdf1dd8
child 161103 7454e1c000672b315c5a6d07312535691e1092dd
push id25867
push userryanvm@gmail.com
push dateThu, 19 Dec 2013 02:19:33 +0000
treeherdermozilla-central@04a70c8908de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs951609
milestone29.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 951609 - Fix scope issues in child.js. r=ochameau
toolkit/devtools/server/child.js
--- a/toolkit/devtools/server/child.js
+++ b/toolkit/devtools/server/child.js
@@ -1,11 +1,10 @@
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
-Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+const {DevToolsUtils} = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const {DebuggerServer, ActorPool} = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
 
 if (!DebuggerServer.initialized) {
   DebuggerServer.init();
 }
 
 // In case of apps being loaded in parent process, DebuggerServer is already
 // initialized, but child specific actors are not registered.
 // Otherwise, for apps in child process, we need to load actors the first