mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 17:25:36 +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
102 lines
2.9 KiB
JavaScript
102 lines
2.9 KiB
JavaScript
function frameScript()
|
|
{
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
function eventHandler(e) {
|
|
if (!docShell) {
|
|
sendAsyncMessage("Test:Fail", "docShell is null");
|
|
}
|
|
|
|
sendAsyncMessage("Test:Event", [e.type, e.target === content.document, e.eventPhase]);
|
|
}
|
|
|
|
let outerID = content.windowUtils.outerWindowID;
|
|
function onOuterWindowDestroyed(subject, topic, data) {
|
|
if (docShell) {
|
|
sendAsyncMessage("Test:Fail", "docShell is non-null");
|
|
}
|
|
|
|
let id = subject.QueryInterface(Ci.nsISupportsPRUint64).data;
|
|
sendAsyncMessage("Test:Event", ["outer-window-destroyed", id == outerID]);
|
|
if (id == outerID) {
|
|
Services.obs.removeObserver(onOuterWindowDestroyed, "outer-window-destroyed");
|
|
}
|
|
}
|
|
|
|
let url = "https://example.com/browser/dom/base/test/file_messagemanager_unload.html";
|
|
|
|
content.location = url;
|
|
addEventListener("load", (e) => {
|
|
if (e.target.location != url) {
|
|
return;
|
|
}
|
|
|
|
addEventListener("unload", eventHandler, false);
|
|
addEventListener("unload", eventHandler, true);
|
|
addEventListener("pagehide", eventHandler, false);
|
|
addEventListener("pagehide", eventHandler, true);
|
|
Services.obs.addObserver(onOuterWindowDestroyed, "outer-window-destroyed");
|
|
|
|
sendAsyncMessage("Test:Ready");
|
|
}, true);
|
|
}
|
|
|
|
const EXPECTED = [
|
|
// Unload events on the TabChildGlobal. These come first so that the
|
|
// docshell is available.
|
|
["unload", false, 2],
|
|
["unload", false, 2],
|
|
|
|
// pagehide and unload events for the top-level page.
|
|
["pagehide", true, 1],
|
|
["pagehide", true, 3],
|
|
["unload", true, 1],
|
|
|
|
// pagehide and unload events for the iframe.
|
|
["pagehide", false, 1],
|
|
["pagehide", false, 3],
|
|
["unload", false, 1],
|
|
|
|
// outer-window-destroyed for both pages.
|
|
["outer-window-destroyed", false],
|
|
["outer-window-destroyed", true],
|
|
];
|
|
|
|
function test() {
|
|
waitForExplicitFinish();
|
|
|
|
var newTab = BrowserTestUtils.addTab(gBrowser, "about:blank");
|
|
gBrowser.selectedTab = newTab;
|
|
|
|
let browser = newTab.linkedBrowser;
|
|
let frameLoader = browser.frameLoader;
|
|
ok(frameLoader !== null, "frameLoader looks okay");
|
|
|
|
browser.messageManager.loadFrameScript("data:,(" + frameScript.toString() + ")()", false);
|
|
|
|
browser.messageManager.addMessageListener("Test:Fail", (msg) => {
|
|
ok(false, msg.data);
|
|
}, true);
|
|
|
|
let index = 0;
|
|
browser.messageManager.addMessageListener("Test:Event", (msg) => {
|
|
ok(msg.target === browser, "<browser> is correct");
|
|
ok(msg.targetFrameLoader === frameLoader, "frameLoader is correct");
|
|
ok(browser.frameLoader === null, "browser frameloader null during teardown");
|
|
|
|
info(JSON.stringify(msg.data));
|
|
|
|
is(JSON.stringify(msg.data), JSON.stringify(EXPECTED[index]), "results match");
|
|
index++;
|
|
|
|
if (index == EXPECTED.length) {
|
|
finish();
|
|
}
|
|
}, true);
|
|
|
|
browser.messageManager.addMessageListener("Test:Ready", () => {
|
|
info("Got ready message");
|
|
gBrowser.removeCurrentTab();
|
|
});
|
|
}
|