Bug 1245462 - Explicitely import gDevTools r=jryans

toolbox.js was using Cu.import(gDevTools) without second argument
and ended up injecting gDevTools into all next modules being loaded.
Hopefully, fonts.js seems to be the only one relying on this!
This commit is contained in:
Alexandre Poirot 2016-02-11 04:29:47 -08:00
parent 37ff108c43
commit 7768e6cdb7
2 changed files with 2 additions and 0 deletions

View File

@ -9,6 +9,7 @@
const {Cu} = require("chrome");
const {setTimeout, clearTimeout} =
Cu.import("resource://gre/modules/Timer.jsm", {});
const {gDevTools} = require("devtools/client/framework/devtools");
const DEFAULT_PREVIEW_TEXT = "Abc";
const PREVIEW_UPDATE_DELAY = 150;

View File

@ -9,6 +9,7 @@ Cu.import("resource://devtools/client/shared/browser-loader.js", BrowserLoaderMo
var { loader, require } = BrowserLoaderModule.BrowserLoader("resource://devtools/client/performance/", this);
var { Task } = require("resource://gre/modules/Task.jsm");
var { Heritage, ViewHelpers, WidgetMethods } = require("resource://devtools/client/shared/widgets/ViewHelpers.jsm");
var {gDevTools} = require("devtools/client/framework/devtools");
// Events emitted by various objects in the panel.
var EVENTS = require("devtools/client/performance/events");