Bug 1247203 - Do not hardcode main module path in Loader.jsm. r=jryans
authorAlexandre Poirot <poirot.alex@gmail.com>
Fri, 04 Mar 2016 07:51:12 -0800
changeset 323250 bfd61742bd5952153c5fc97c6ff9ae22e6594f3e
parent 323249 3b8417be6c87458bf84166b282b155019bc834a4
child 323251 36f76c141709a89c42718b8efa9c8e272ef549c7
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjryans
bugs1247203
milestone47.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 1247203 - Do not hardcode main module path in Loader.jsm. r=jryans
devtools/shared/Loader.jsm
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@@ -319,19 +319,20 @@ DevToolsLoader.prototype = {
    */
   reload: function() {
     var events = this.require("sdk/system/events");
     events.emit("startupcache-invalidate", {});
     events.emit("devtools-unloaded", {});
 
     this._provider.unload("reload");
     delete this._provider;
+    let mainid = this._mainid;
     delete this._mainid;
     this._loadProvider();
-    this.main("devtools/client/main");
+    this.main(mainid);
   },
 
   /**
    * Sets whether the compartments loaded by this instance should be invisible
    * to the debugger.  Invisibility is needed for loaders that support debugging
    * of chrome code.  This is true of remote target environments, like Fennec or
    * B2G.  It is not the default case for desktop Firefox because we offer the
    * Browser Toolbox for chrome debugging there, which uses its own, separate