Bug 1795151 - Convert gfx/layers/apz JSMs to ESMs. r=botond

Differential Revision: https://phabricator.services.mozilla.com/D159330
This commit is contained in:
Mike Conley 2022-10-17 14:46:13 +00:00
parent 7abc3b9f92
commit 797281a881
4 changed files with 11 additions and 13 deletions

View File

@ -1,5 +1,3 @@
var EXPORTED_SYMBOLS = ["FissionTestHelperChild"];
// This code runs in the content process that holds the window to which
// this actor is attached. There is one instance of this class for each
// "inner window" (i.e. one per content document, including iframes/nested
@ -9,7 +7,7 @@ var EXPORTED_SYMBOLS = ["FissionTestHelperChild"];
// that they can communicate with each other regardless of which process
// they live in.
class FissionTestHelperChild extends JSWindowActorChild {
export class FissionTestHelperChild extends JSWindowActorChild {
constructor() {
super();
this._msgCounter = 0;

View File

@ -1,5 +1,3 @@
var EXPORTED_SYMBOLS = ["FissionTestHelperParent"];
// This code always runs in the parent process. There is one instance of
// this class for each "inner window" (should be one per content document,
// including iframes/nested iframes).
@ -8,7 +6,7 @@ var EXPORTED_SYMBOLS = ["FissionTestHelperParent"];
// that they can communicate with each other regardless of which process
// they live in.
class FissionTestHelperParent extends JSWindowActorParent {
export class FissionTestHelperParent extends JSWindowActorParent {
constructor() {
super();
this._testCompletePromise = new Promise(resolve => {

View File

@ -12,8 +12,8 @@ skip-if =
(os == 'win' && bits == 32) # Some subtests fail intermittently on Win7.
(os == 'linux' && bits == 64) # Bug 1773830
support-files =
FissionTestHelperParent.jsm
FissionTestHelperChild.jsm
FissionTestHelperParent.sys.mjs
FissionTestHelperChild.sys.mjs
helper_fission_*.*
!/dom/animation/test/testcommon.js
[browser_test_select_zoom.js]

View File

@ -75,19 +75,21 @@ add_task(async function test_main() {
fission: true,
});
// We import the JSM here so that we can install functions on the class
// We import the ESM here so that we can install functions on the class
// below.
const { FissionTestHelperParent } = ChromeUtils.import(
getRootDirectory(gTestPath) + "FissionTestHelperParent.jsm"
const { FissionTestHelperParent } = ChromeUtils.importESModule(
getRootDirectory(gTestPath) + "FissionTestHelperParent.sys.mjs"
);
FissionTestHelperParent.SimpleTest = SimpleTest;
ChromeUtils.registerWindowActor("FissionTestHelper", {
parent: {
moduleURI: getRootDirectory(gTestPath) + "FissionTestHelperParent.jsm",
esModuleURI:
getRootDirectory(gTestPath) + "FissionTestHelperParent.sys.mjs",
},
child: {
moduleURI: getRootDirectory(gTestPath) + "FissionTestHelperChild.jsm",
esModuleURI:
getRootDirectory(gTestPath) + "FissionTestHelperChild.sys.mjs",
events: {
"FissionTestHelper:Init": { capture: true, wantUntrusted: true },
},