forked from mirrors/gecko-dev
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
111 lines
3.6 KiB
JavaScript
111 lines
3.6 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
/* eslint-env mozilla/frame-script */
|
|
|
|
const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
|
|
|
|
const DUMMY = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
|
|
|
|
function frameScript() {
|
|
addMessageListener("Test:GetIsAppTab", function() {
|
|
sendAsyncMessage("Test:IsAppTab", { isAppTab: docShell.isAppTab });
|
|
});
|
|
}
|
|
|
|
function loadFrameScript(browser) {
|
|
browser.messageManager.loadFrameScript("data:,(" + frameScript.toString() + ")();", true);
|
|
}
|
|
|
|
function isBrowserAppTab(browser) {
|
|
return new Promise(resolve => {
|
|
function listener({ data }) {
|
|
browser.messageManager.removeMessageListener("Test:IsAppTab", listener);
|
|
resolve(data.isAppTab);
|
|
}
|
|
// It looks like same-process messages may be reordered by the message
|
|
// manager, so we need to wait one tick before sending the message.
|
|
executeSoon(function() {
|
|
browser.messageManager.addMessageListener("Test:IsAppTab", listener);
|
|
browser.messageManager.sendAsyncMessage("Test:GetIsAppTab");
|
|
});
|
|
});
|
|
}
|
|
|
|
// Restarts the child process by crashing it then reloading the tab
|
|
var restart = async function(browser) {
|
|
// If the tab isn't remote this would crash the main process so skip it
|
|
if (!browser.isRemoteBrowser)
|
|
return;
|
|
|
|
// Make sure the main process has all of the current tab state before crashing
|
|
await TabStateFlusher.flush(browser);
|
|
|
|
await BrowserTestUtils.crashBrowser(browser);
|
|
|
|
let tab = gBrowser.getTabForBrowser(browser);
|
|
SessionStore.reviveCrashedTab(tab);
|
|
|
|
await promiseTabLoaded(tab);
|
|
};
|
|
|
|
add_task(async function navigate() {
|
|
let tab = BrowserTestUtils.addTab(gBrowser, "about:robots");
|
|
let browser = tab.linkedBrowser;
|
|
gBrowser.selectedTab = tab;
|
|
await BrowserTestUtils.browserStopped(gBrowser);
|
|
loadFrameScript(browser);
|
|
let isAppTab = await isBrowserAppTab(browser);
|
|
ok(!isAppTab, "Docshell shouldn't think it is an app tab");
|
|
|
|
gBrowser.pinTab(tab);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(isAppTab, "Docshell should think it is an app tab");
|
|
|
|
BrowserTestUtils.loadURI(gBrowser, DUMMY);
|
|
await BrowserTestUtils.browserStopped(gBrowser);
|
|
loadFrameScript(browser);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(isAppTab, "Docshell should think it is an app tab");
|
|
|
|
gBrowser.unpinTab(tab);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(!isAppTab, "Docshell shouldn't think it is an app tab");
|
|
|
|
gBrowser.pinTab(tab);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(isAppTab, "Docshell should think it is an app tab");
|
|
|
|
BrowserTestUtils.loadURI(gBrowser, "about:robots");
|
|
await BrowserTestUtils.browserStopped(gBrowser);
|
|
loadFrameScript(browser);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(isAppTab, "Docshell should think it is an app tab");
|
|
|
|
gBrowser.removeCurrentTab();
|
|
});
|
|
|
|
add_task(async function crash() {
|
|
if (!gMultiProcessBrowser || !AppConstants.MOZ_CRASHREPORTER) {
|
|
return;
|
|
}
|
|
|
|
let tab = BrowserTestUtils.addTab(gBrowser, DUMMY);
|
|
let browser = tab.linkedBrowser;
|
|
gBrowser.selectedTab = tab;
|
|
await BrowserTestUtils.browserStopped(gBrowser);
|
|
loadFrameScript(browser);
|
|
let isAppTab = await isBrowserAppTab(browser);
|
|
ok(!isAppTab, "Docshell shouldn't think it is an app tab");
|
|
|
|
gBrowser.pinTab(tab);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(isAppTab, "Docshell should think it is an app tab");
|
|
|
|
await restart(browser);
|
|
loadFrameScript(browser);
|
|
isAppTab = await isBrowserAppTab(browser);
|
|
ok(isAppTab, "Docshell should think it is an app tab");
|
|
|
|
gBrowser.removeCurrentTab();
|
|
});
|