Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1822556 - Update consumers of toolkit/actors to import ES modules directly. r=mossop,perftest-reviewers,credential-management-reviewers,sgalich,kshampur

Browse Source 
Depends on D172679

Differential Revision: https://phabricator.services.mozilla.com/D172680
This commit is contained in:
Mark Banner 2023-03-16 12:50:27 +00:00
parent 21fc8cf82d
commit 1646117163
17 changed files with 63 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/actors/AboutPluginsChild.sys.mjs
View File

@ -3,8 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
export class AboutPluginsChild extends RemotePageChild {}

4
browser/actors/AboutPocketChild.sys.mjs
View File

@ -3,8 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
export class AboutPocketChild extends RemotePageChild {}

4
browser/actors/AboutPrivateBrowsingChild.sys.mjs
View File

@ -5,9 +5,7 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
const lazy = {};

4
browser/actors/AboutProtectionsChild.sys.mjs
View File

@ -3,9 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
export class AboutProtectionsChild extends RemotePageChild {
actorCreated() {

4
browser/actors/AboutTabCrashedChild.sys.mjs
View File

@ -3,8 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
export class AboutTabCrashedChild extends RemotePageChild {}

4
browser/base/content/test/forms/head.js
View File

@ -32,8 +32,8 @@ async function openSelectPopup(
function hideSelectPopup(mode = "enter", win = window) {
let browser = win.gBrowser.selectedBrowser;
let selectClosedPromise = SpecialPowers.spawn(browser, [], async function() {
let { SelectContentHelper } = ChromeUtils.import(
"resource://gre/actors/SelectChild.jsm"
let { SelectContentHelper } = ChromeUtils.importESModule(
"resource://gre/actors/SelectChild.sys.mjs"
);
return ContentTaskUtils.waitForCondition(() => !SelectContentHelper.open);
});

8
browser/extensions/formautofill/api.js
View File

@ -23,11 +23,9 @@ ChromeUtils.defineModuleGetter(
"FormAutofillParent",
"resource://autofill/FormAutofillParent.jsm"
);
ChromeUtils.defineModuleGetter(
this,
"AutoCompleteParent",
"resource://gre/actors/AutoCompleteParent.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
AutoCompleteParent: "resource://gre/actors/AutoCompleteParent.sys.mjs",
});
XPCOMUtils.defineLazyServiceGetter(
this,

4
browser/extensions/formautofill/content/customElements.js
View File

@ -11,8 +11,8 @@
// Wrap in a block to prevent leaking to window scope.
(() => {
function sendMessageToBrowser(msgName, data) {
let { AutoCompleteParent } = ChromeUtils.import(
"resource://gre/actors/AutoCompleteParent.jsm"
let { AutoCompleteParent } = ChromeUtils.importESModule(
"resource://gre/actors/AutoCompleteParent.sys.mjs"
);
let actor = AutoCompleteParent.getCurrentActor();

4
browser/extensions/formautofill/test/browser/head.js
View File

@ -530,8 +530,8 @@ async function waitForPopupEnabled(browser) {
function waitPopupStateInChild(bc, messageName) {
return SpecialPowers.spawn(bc, [messageName], expectedMessage => {
return new Promise(resolve => {
const { AutoCompleteChild } = ChromeUtils.import(
"resource://gre/actors/AutoCompleteChild.jsm"
const { AutoCompleteChild } = ChromeUtils.importESModule(
"resource://gre/actors/AutoCompleteChild.sys.mjs"
);
let listener = {

4
testing/talos/talos/tests/tabswitch/actors/TalosTabSwitchChild.sys.mjs
View File

@ -2,9 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
export class TalosTabSwitchChild extends RemotePageChild {
actorCreated() {

4
toolkit/actors/AboutHttpsOnlyErrorChild.sys.mjs
View File

@ -4,9 +4,7 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
const lazy = {};

4
toolkit/actors/NetErrorChild.sys.mjs
View File

@ -9,9 +9,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
AppInfo: "chrome://remote/content/shared/AppInfo.sys.mjs",
});
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
export class NetErrorChild extends RemotePageChild {
actorCreated() {

4
toolkit/components/certviewer/AboutCertViewerChild.jsm
View File

@ -5,8 +5,8 @@
var EXPORTED_SYMBOLS = ["AboutCertViewerChild"];
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
const { RemotePageChild } = ChromeUtils.importESModule(
"resource://gre/actors/RemotePageChild.sys.mjs"
);
class AboutCertViewerChild extends RemotePageChild {}

2
toolkit/components/formautofill/FormAutofillChild.jsm
View File

@ -12,11 +12,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AutoCompleteChild: "resource://gre/actors/AutoCompleteChild.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
AutoCompleteChild: "resource://gre/actors/AutoCompleteChild.jsm",
FormAutofill: "resource://autofill/FormAutofill.jsm",
FormAutofillContent: "resource://autofill/FormAutofillContent.jsm",
FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",

4
toolkit/components/printing/tests/head.js
View File

@ -114,8 +114,8 @@ class PrintHelper {
// This is used only for the old print preview. For tests
// involving the newer UI, use waitForPreview instead.
static waitForOldPrintPreview(expectedBrowser) {
const { PrintingParent } = ChromeUtils.import(
"resource://gre/actors/PrintingParent.jsm"
const { PrintingParent } = ChromeUtils.importESModule(
"resource://gre/actors/PrintingParent.sys.mjs"
);
return new Promise(resolve => {

4
toolkit/content/widgets/browser-custom-element.js
View File

@ -21,12 +21,12 @@
BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
Finder: "resource://gre/modules/Finder.sys.mjs",
FinderParent: "resource://gre/modules/FinderParent.sys.mjs",
PopupBlocker: "resource://gre/actors/PopupBlockingParent.sys.mjs",
SelectParentHelper: "resource://gre/actors/SelectParent.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
PopupBlocker: "resource://gre/actors/PopupBlockingParent.jsm",
RemoteWebNavigation: "resource://gre/modules/RemoteWebNavigation.jsm",
SelectParentHelper: "resource://gre/actors/SelectParent.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "blankURI", () =>

77
toolkit/modules/ActorManagerParent.sys.mjs
View File

@ -108,11 +108,11 @@ let JSWINDOWACTORS = {
AudioPlayback: {
parent: {
moduleURI: "resource://gre/actors/AudioPlaybackParent.jsm",
esModuleURI: "resource://gre/actors/AudioPlaybackParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/AudioPlaybackChild.jsm",
esModuleURI: "resource://gre/actors/AudioPlaybackChild.sys.mjs",
observers: ["audio-playback"],
},
@ -121,7 +121,7 @@ let JSWINDOWACTORS = {
AutoComplete: {
parent: {
moduleURI: "resource://gre/actors/AutoCompleteParent.jsm",
esModuleURI: "resource://gre/actors/AutoCompleteParent.sys.mjs",
// These two messages are also used, but are currently synchronous calls
// through the per-process message manager.
// "FormAutoComplete:GetSelectedIndex",
@ -129,7 +129,7 @@ let JSWINDOWACTORS = {
},
child: {
moduleURI: "resource://gre/actors/AutoCompleteChild.jsm",
esModuleURI: "resource://gre/actors/AutoCompleteChild.sys.mjs",
},
allFrames: true,
@ -137,11 +137,11 @@ let JSWINDOWACTORS = {
Autoplay: {
parent: {
moduleURI: "resource://gre/actors/AutoplayParent.jsm",
esModuleURI: "resource://gre/actors/AutoplayParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/AutoplayChild.jsm",
esModuleURI: "resource://gre/actors/AutoplayChild.sys.mjs",
events: {
GloballyAutoplayBlocked: {},
},
@ -152,11 +152,11 @@ let JSWINDOWACTORS = {
AutoScroll: {
parent: {
moduleURI: "resource://gre/actors/AutoScrollParent.jsm",
esModuleURI: "resource://gre/actors/AutoScrollParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/AutoScrollChild.jsm",
esModuleURI: "resource://gre/actors/AutoScrollChild.sys.mjs",
events: {
mousedown: { capture: true, mozSystemGroup: true },
},
@ -167,7 +167,7 @@ let JSWINDOWACTORS = {
BackgroundThumbnails: {
child: {
moduleURI: "resource://gre/actors/BackgroundThumbnailsChild.jsm",
esModuleURI: "resource://gre/actors/BackgroundThumbnailsChild.sys.mjs",
events: {
DOMDocElementInserted: { capture: true },
},
@ -177,11 +177,11 @@ let JSWINDOWACTORS = {
BrowserElement: {
parent: {
moduleURI: "resource://gre/actors/BrowserElementParent.jsm",
esModuleURI: "resource://gre/actors/BrowserElementParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/BrowserElementChild.jsm",
esModuleURI: "resource://gre/actors/BrowserElementChild.sys.mjs",
events: {
DOMWindowClose: {},
},
@ -204,10 +204,10 @@ let JSWINDOWACTORS = {
Controllers: {
parent: {
moduleURI: "resource://gre/actors/ControllersParent.jsm",
esModuleURI: "resource://gre/actors/ControllersParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/ControllersChild.jsm",
esModuleURI: "resource://gre/actors/ControllersChild.sys.mjs",
},
allFrames: true,
@ -235,11 +235,11 @@ let JSWINDOWACTORS = {
DateTimePicker: {
parent: {
moduleURI: "resource://gre/actors/DateTimePickerParent.jsm",
esModuleURI: "resource://gre/actors/DateTimePickerParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/DateTimePickerChild.jsm",
esModuleURI: "resource://gre/actors/DateTimePickerChild.sys.mjs",
events: {
MozOpenDateTimePicker: {},
MozUpdateDateTimePicker: {},
@ -252,7 +252,7 @@ let JSWINDOWACTORS = {
ExtFind: {
child: {
moduleURI: "resource://gre/actors/ExtFindChild.jsm",
esModuleURI: "resource://gre/actors/ExtFindChild.sys.mjs",
},
allFrames: true,
@ -260,10 +260,10 @@ let JSWINDOWACTORS = {
FindBar: {
parent: {
moduleURI: "resource://gre/actors/FindBarParent.jsm",
esModuleURI: "resource://gre/actors/FindBarParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/FindBarChild.jsm",
esModuleURI: "resource://gre/actors/FindBarChild.sys.mjs",
events: {
keypress: { mozSystemGroup: true },
},
@ -277,7 +277,7 @@ let JSWINDOWACTORS = {
// searches for matches and highlights them.
Finder: {
child: {
moduleURI: "resource://gre/actors/FinderChild.jsm",
esModuleURI: "resource://gre/actors/FinderChild.sys.mjs",
},
allFrames: true,
@ -299,11 +299,11 @@ let JSWINDOWACTORS = {
InlineSpellChecker: {
parent: {
moduleURI: "resource://gre/actors/InlineSpellCheckerParent.jsm",
esModuleURI: "resource://gre/actors/InlineSpellCheckerParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/InlineSpellCheckerChild.jsm",
esModuleURI: "resource://gre/actors/InlineSpellCheckerChild.sys.mjs",
},
allFrames: true,
@ -311,7 +311,8 @@ let JSWINDOWACTORS = {
KeyPressEventModelChecker: {
child: {
moduleURI: "resource://gre/actors/KeyPressEventModelCheckerChild.jsm",
esModuleURI:
"resource://gre/actors/KeyPressEventModelCheckerChild.sys.mjs",
events: {
CheckKeyPressEventModel: { capture: true, mozSystemGroup: true },
},
@ -403,10 +404,10 @@ let JSWINDOWACTORS = {
PopupBlocking: {
parent: {
moduleURI: "resource://gre/actors/PopupBlockingParent.jsm",
esModuleURI: "resource://gre/actors/PopupBlockingParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/PopupBlockingChild.jsm",
esModuleURI: "resource://gre/actors/PopupBlockingChild.sys.mjs",
events: {
DOMPopupBlocked: { capture: true },
// Only listen for the `pageshow` event after the actor has already been
@ -419,10 +420,10 @@ let JSWINDOWACTORS = {
Printing: {
parent: {
moduleURI: "resource://gre/actors/PrintingParent.jsm",
esModuleURI: "resource://gre/actors/PrintingParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/PrintingChild.jsm",
esModuleURI: "resource://gre/actors/PrintingChild.sys.mjs",
events: {
PrintingError: { capture: true },
printPreviewUpdate: { capture: true },
@ -432,14 +433,14 @@ let JSWINDOWACTORS = {
PrintingSelection: {
child: {
moduleURI: "resource://gre/actors/PrintingSelectionChild.jsm",
esModuleURI: "resource://gre/actors/PrintingSelectionChild.sys.mjs",
},
allFrames: true,
},
PurgeSessionHistory: {
child: {
moduleURI: "resource://gre/actors/PurgeSessionHistoryChild.jsm",
esModuleURI: "resource://gre/actors/PurgeSessionHistoryChild.sys.mjs",
},
allFrames: true,
},
@ -489,7 +490,7 @@ let JSWINDOWACTORS = {
Thumbnails: {
child: {
moduleURI: "resource://gre/actors/ThumbnailsChild.jsm",
esModuleURI: "resource://gre/actors/ThumbnailsChild.sys.mjs",
},
},
@ -513,7 +514,7 @@ let JSWINDOWACTORS = {
UAWidgets: {
child: {
moduleURI: "resource://gre/actors/UAWidgetsChild.jsm",
esModuleURI: "resource://gre/actors/UAWidgetsChild.sys.mjs",
events: {
UAWidgetSetupOrChange: {},
UAWidgetTeardown: {},
@ -525,10 +526,10 @@ let JSWINDOWACTORS = {
UnselectedTabHover: {
parent: {
moduleURI: "resource://gre/actors/UnselectedTabHoverParent.jsm",
esModuleURI: "resource://gre/actors/UnselectedTabHoverParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/UnselectedTabHoverChild.jsm",
esModuleURI: "resource://gre/actors/UnselectedTabHoverChild.sys.mjs",
events: {
"UnselectedTabHover:Enable": {},
"UnselectedTabHover:Disable": {},
@ -546,11 +547,11 @@ let JSWINDOWACTORS = {
if (!Services.prefs.getBoolPref("browser.pagedata.enabled", false)) {
JSWINDOWACTORS.ContentMeta = {
parent: {
moduleURI: "resource://gre/actors/ContentMetaParent.jsm",
esModuleURI: "resource://gre/actors/ContentMetaParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/ContentMetaChild.jsm",
esModuleURI: "resource://gre/actors/ContentMetaChild.sys.mjs",
events: {
DOMContentLoaded: {},
DOMMetaAdded: { createActor: false },
@ -565,11 +566,11 @@ if (AppConstants.platform != "android") {
// For GeckoView support see bug 1776829.
JSWINDOWACTORS.ClipboardReadPaste = {
parent: {
moduleURI: "resource://gre/actors/ClipboardReadPasteParent.jsm",
esModuleURI: "resource://gre/actors/ClipboardReadPasteParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/ClipboardReadPasteChild.jsm",
esModuleURI: "resource://gre/actors/ClipboardReadPasteChild.sys.mjs",
events: {
MozClipboardReadPaste: {},
},
@ -583,11 +584,11 @@ if (AppConstants.platform != "android") {
*/
JSWINDOWACTORS.Select = {
parent: {
moduleURI: "resource://gre/actors/SelectParent.jsm",
esModuleURI: "resource://gre/actors/SelectParent.sys.mjs",
},
child: {
moduleURI: "resource://gre/actors/SelectChild.jsm",
esModuleURI: "resource://gre/actors/SelectChild.sys.mjs",
events: {
mozshowdropdown: {},
"mozshowdropdown-sourcetouch": {},