mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
e930b89c34
*** Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8 This changes the behavior of ChromeUtils.import() to return an exports object, rather than a module global, in all cases except when `null` is passed as a second argument, and changes the default behavior not to pollute the global scope with the module's exports. Thus, the following code written for the old model: ChromeUtils.import("resource://gre/modules/Services.jsm"); is approximately the same as the following, in the new model: var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); Since the two behaviors are mutually incompatible, this patch will land with a scripted rewrite to update all existing callers to use the new model rather than the old. *** Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs This was done using the followng script: https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm *** Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D16747 *** Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D16748 *** Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D16749 *** Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs *** Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D16750 --HG-- extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895 extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
145 lines
4.4 KiB
JavaScript
145 lines
4.4 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
/* globals ExtensionAPI */
|
|
|
|
const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
function loadChromeScripts(win) {
|
|
Services.scriptloader.loadSubScript("chrome://mochikit/content/chrome-harness.js", win);
|
|
Services.scriptloader.loadSubScript("chrome://mochikit/content/mochitest-e10s-utils.js", win);
|
|
Services.scriptloader.loadSubScript("chrome://mochikit/content/browser-test.js", win);
|
|
}
|
|
|
|
// ///// Android ///////
|
|
|
|
const windowTracker = {
|
|
init() {
|
|
Services.obs.addObserver(this, "chrome-document-global-created");
|
|
},
|
|
|
|
async observe(window, topic, data) {
|
|
if (topic === "chrome-document-global-created") {
|
|
await new Promise(resolve =>
|
|
window.addEventListener("DOMContentLoaded", resolve, {once: true}));
|
|
|
|
let {document} = window;
|
|
let {documentURI} = document;
|
|
|
|
if (documentURI !== AppConstants.BROWSER_CHROME_URL) {
|
|
return;
|
|
}
|
|
loadChromeScripts(window);
|
|
}
|
|
},
|
|
};
|
|
|
|
function androidStartup() {
|
|
// Only browser chrome tests need help starting.
|
|
let testRoot = Services.prefs.getStringPref("mochitest.testRoot", "");
|
|
if (testRoot.endsWith("/chrome")) {
|
|
// The initial window is created from browser startup, which races
|
|
// against extension initialization. If it has already been created,
|
|
// inject the test scripts now, otherwise wait for the browser window
|
|
// to show up.
|
|
let win = Services.wm.getMostRecentWindow("navigator:browser");
|
|
if (win) {
|
|
loadChromeScripts(win);
|
|
return;
|
|
}
|
|
|
|
windowTracker.init();
|
|
}
|
|
}
|
|
|
|
// ///// Desktop ///////
|
|
|
|
// Special case for Thunderbird windows.
|
|
const IS_THUNDERBIRD = Services.appinfo.ID == "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
|
|
const WINDOW_TYPE = IS_THUNDERBIRD ? "mail:3pane" : "navigator:browser";
|
|
|
|
var WindowListener = {
|
|
// browser-test.js is only loaded into the first window. Setup that
|
|
// needs to happen in all navigator:browser windows should go here.
|
|
setupWindow(win) {
|
|
win.nativeConsole = win.console;
|
|
ChromeUtils.defineModuleGetter(win, "console",
|
|
"resource://gre/modules/Console.jsm");
|
|
},
|
|
|
|
tearDownWindow(win) {
|
|
if (win.nativeConsole) {
|
|
win.console = win.nativeConsole;
|
|
win.nativeConsole = undefined;
|
|
}
|
|
},
|
|
|
|
onOpenWindow(xulWin) {
|
|
let win = xulWin.docShell.domWindow;
|
|
|
|
win.addEventListener("load", function() {
|
|
if (win.document.documentElement.getAttribute("windowtype") == WINDOW_TYPE) {
|
|
WindowListener.setupWindow(win);
|
|
}
|
|
}, {once: true});
|
|
},
|
|
};
|
|
|
|
function loadMochitest(e) {
|
|
let flavor = e.detail[0];
|
|
let url = e.detail[1];
|
|
|
|
let win = Services.wm.getMostRecentWindow(WINDOW_TYPE);
|
|
win.removeEventListener("mochitest-load", loadMochitest);
|
|
|
|
// for mochitest-plain, navigating to the url is all we need
|
|
if (!IS_THUNDERBIRD) {
|
|
win.loadURI(url, null, null, null, null, null, null, null,
|
|
Services.scriptSecurityManager.getSystemPrincipal());
|
|
}
|
|
if (flavor == "mochitest") {
|
|
return;
|
|
}
|
|
|
|
WindowListener.setupWindow(win);
|
|
Services.wm.addListener(WindowListener);
|
|
|
|
loadChromeScripts(win);
|
|
}
|
|
|
|
this.mochikit = class extends ExtensionAPI {
|
|
onStartup() {
|
|
let aomStartup = Cc["@mozilla.org/addons/addon-manager-startup;1"]
|
|
.getService(Ci.amIAddonManagerStartup);
|
|
const manifestURI = Services.io.newURI("manifest.json", null, this.extension.rootURI);
|
|
const targetURL = this.extension.rootURI.resolve("content/");
|
|
this.chromeHandle = aomStartup.registerChrome(manifestURI, [
|
|
["content", "mochikit", targetURL],
|
|
]);
|
|
|
|
if (AppConstants.platform == "android") {
|
|
androidStartup();
|
|
} else {
|
|
let win = Services.wm.getMostRecentWindow(WINDOW_TYPE);
|
|
// wait for event fired from start_desktop.js containing the
|
|
// suite and url to load
|
|
win.addEventListener("mochitest-load", loadMochitest);
|
|
}
|
|
}
|
|
|
|
onShutdown() {
|
|
if (AppConstants.platform != "android") {
|
|
for (let win of Services.wm.getEnumerator(WINDOW_TYPE)) {
|
|
WindowListener.tearDownWindow(win);
|
|
}
|
|
|
|
Services.wm.removeListener(WindowListener);
|
|
}
|
|
|
|
this.chromeHandle.destruct();
|
|
this.chromeHandle = null;
|
|
}
|
|
};
|