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
93 lines
2.4 KiB
JavaScript
93 lines
2.4 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
|
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
|
|
"resource://gre/modules/PlacesUtils.jsm");
|
|
|
|
// Clear the network cache between every test to make sure we get a stable state
|
|
Services.cache2.clear();
|
|
|
|
function waitForFaviconMessage(isTabIcon = undefined, expectedURL = undefined) {
|
|
return new Promise((resolve, reject) => {
|
|
let listener = msg => {
|
|
// If requested filter out loads of the wrong kind of icon.
|
|
if (isTabIcon != undefined && isTabIcon != msg.data.canUseForTab) {
|
|
return;
|
|
}
|
|
|
|
if (expectedURL && msg.data.originalURL != expectedURL) {
|
|
return;
|
|
}
|
|
|
|
window.messageManager.removeMessageListener("Link:SetIcon", listener);
|
|
window.messageManager.removeMessageListener("Link:SetFailedIcon", listener);
|
|
|
|
if (msg.name == "Link:SetIcon") {
|
|
resolve({
|
|
iconURL: msg.data.originalURL,
|
|
dataURL: msg.data.iconURL,
|
|
canUseForTab: msg.data.canUseForTab,
|
|
});
|
|
} else {
|
|
reject({
|
|
iconURL: msg.data.originalURL,
|
|
canUseForTab: msg.data.canUseForTab,
|
|
});
|
|
}
|
|
};
|
|
|
|
window.messageManager.addMessageListener("Link:SetIcon", listener);
|
|
window.messageManager.addMessageListener("Link:SetFailedIcon", listener);
|
|
});
|
|
}
|
|
|
|
function waitForFavicon(browser, url) {
|
|
return new Promise(resolve => {
|
|
let listener = {
|
|
onLinkIconAvailable(b, dataURI, iconURI) {
|
|
if (b !== browser || iconURI != url) {
|
|
return;
|
|
}
|
|
|
|
gBrowser.removeTabsProgressListener(listener);
|
|
resolve();
|
|
},
|
|
};
|
|
|
|
gBrowser.addTabsProgressListener(listener);
|
|
});
|
|
}
|
|
|
|
function waitForLinkAvailable(browser) {
|
|
let resolve, reject;
|
|
|
|
let listener = {
|
|
onLinkIconAvailable(b, dataURI, iconURI) {
|
|
// Ignore icons for other browsers or empty icons.
|
|
if (browser !== b || !iconURI) {
|
|
return;
|
|
}
|
|
|
|
gBrowser.removeTabsProgressListener(listener);
|
|
resolve(iconURI);
|
|
},
|
|
};
|
|
|
|
let promise = new Promise((res, rej) => {
|
|
resolve = res;
|
|
reject = rej;
|
|
|
|
gBrowser.addTabsProgressListener(listener);
|
|
});
|
|
|
|
promise.cancel = () => {
|
|
gBrowser.removeTabsProgressListener(listener);
|
|
|
|
reject();
|
|
};
|
|
|
|
return promise;
|
|
}
|