Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1678550 - [devtools] Move nested require calls to the top of damp.js r=perftest-reviewers,nchevobbe,ochameau

Browse Source 
Depends on D97731

We used to delay those calls because they needed rootURI to be set. This is no longer necessary.

Differential Revision: https://phabricator.services.mozilla.com/D97732
This commit is contained in:
Julian Descottes 2021-01-04 13:09:44 +00:00
parent c8ceefd607
commit c02f0ed974
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testing/talos/talos/tests/devtools/addon/content/damp.js
View File

@ -15,6 +15,10 @@ const ChromeUtils = require("ChromeUtils");
const Services = require("Services");
const { AddonManager } = require("resource://gre/modules/AddonManager.jsm");
const DampLoadParentModule = require("damp-test/actors/DampLoadParent.jsm");
const dampTestHead = require("damp-test/tests/head.js");
const DAMP_TESTS = require("damp-test/damp-tests.js");
const env = Cc["@mozilla.org/process/environment;1"].getService(
Ci.nsIEnvironment
);
@ -432,8 +436,7 @@ Damp.prototype = {
try {
dump("Initialize the head file with a reference to this DAMP instance\n");
let head = require("damp-test/tests/head.js");
head.initialize(this);
dampTestHead.initialize(this);
this._registerDampLoadActors();
@ -444,7 +447,6 @@ Damp.prototype = {
// Filter tests via `./mach --subtests filter` command line argument
let filter = Services.prefs.getCharPref("talos.subtests", "");
let DAMP_TESTS = require("damp-test/damp-tests.js");
let tests = DAMP_TESTS.filter(test => !test.disabled).filter(test =>
test.name.includes(filter)
);
@ -492,7 +494,7 @@ Damp.prototype = {
`Wait for a pageshow event for browsing context ${browser.browsingContext.id}\n`
);
return new Promise(resolve => {
const eventDispatcher = this._getDampLoadEventDispatcher();
const eventDispatcher = DampLoadParentModule.EventDispatcher;
const onPageShow = (eventName, data) => {
dump(`Received pageshow event for ${data.browsingContext.id}\n`);
if (data.browsingContext !== browser.browsingContext) {
@ -531,15 +533,6 @@ Damp.prototype = {
dump(`[DampLoad helper] Unregister DampLoad actors\n`);
ChromeUtils.unregisterWindowActor("DampLoad");
},
_getDampLoadEventDispatcher() {
if (!this._dampLoadEventDispatcher) {
const DampLoadParentModule = require("damp-test/actors/DampLoadParent.jsm");
this._dampLoadEventDispatcher = DampLoadParentModule.EventDispatcher;
}
return this._dampLoadEventDispatcher;
},
};
exports.Damp = Damp;