forked from mirrors/gecko-dev
***
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
122 lines
4.4 KiB
JavaScript
122 lines
4.4 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
const {PlacesTestUtils} = ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
|
|
|
|
function promisePageActionPanelOpen() {
|
|
let dwu = window.windowUtils;
|
|
return BrowserTestUtils.waitForCondition(() => {
|
|
// Wait for the main page action button to become visible. It's hidden for
|
|
// some URIs, so depending on when this is called, it may not yet be quite
|
|
// visible. It's up to the caller to make sure it will be visible.
|
|
info("Waiting for main page action button to have non-0 size");
|
|
let bounds = dwu.getBoundsWithoutFlushing(BrowserPageActions.mainButtonNode);
|
|
return bounds.width > 0 && bounds.height > 0;
|
|
}).then(() => {
|
|
// Wait for the panel to become open, by clicking the button if necessary.
|
|
info("Waiting for main page action panel to be open");
|
|
if (BrowserPageActions.panelNode.state == "open") {
|
|
return Promise.resolve();
|
|
}
|
|
let shownPromise = promisePageActionPanelShown();
|
|
EventUtils.synthesizeMouseAtCenter(BrowserPageActions.mainButtonNode, {});
|
|
return shownPromise;
|
|
}).then(() => {
|
|
// Wait for items in the panel to become visible.
|
|
return promisePageActionViewChildrenVisible(BrowserPageActions.mainViewNode);
|
|
});
|
|
}
|
|
|
|
async function waitForActivatedActionPanel() {
|
|
if (!BrowserPageActions.activatedActionPanelNode) {
|
|
info("Waiting for activated-action panel to be added to mainPopupSet");
|
|
await new Promise(resolve => {
|
|
let observer = new MutationObserver(mutations => {
|
|
if (BrowserPageActions.activatedActionPanelNode) {
|
|
observer.disconnect();
|
|
resolve();
|
|
}
|
|
});
|
|
let popupSet = document.getElementById("mainPopupSet");
|
|
observer.observe(popupSet, { childList: true });
|
|
});
|
|
info("Activated-action panel added to mainPopupSet");
|
|
}
|
|
if (!BrowserPageActions.activatedActionPanelNode.state == "open") {
|
|
info("Waiting for activated-action panel popupshown");
|
|
await promisePanelShown(BrowserPageActions.activatedActionPanelNode);
|
|
info("Got activated-action panel popupshown");
|
|
}
|
|
let panelView =
|
|
BrowserPageActions.activatedActionPanelNode.querySelector("panelview");
|
|
if (panelView) {
|
|
await BrowserTestUtils.waitForEvent(
|
|
BrowserPageActions.activatedActionPanelNode,
|
|
"ViewShown"
|
|
);
|
|
await promisePageActionViewChildrenVisible(panelView);
|
|
}
|
|
return panelView;
|
|
}
|
|
|
|
function promisePageActionPanelShown() {
|
|
return promisePanelShown(BrowserPageActions.panelNode);
|
|
}
|
|
|
|
function promisePageActionPanelHidden() {
|
|
return promisePanelHidden(BrowserPageActions.panelNode);
|
|
}
|
|
|
|
function promisePanelShown(panelIDOrNode) {
|
|
return promisePanelEvent(panelIDOrNode, "popupshown");
|
|
}
|
|
|
|
function promisePanelHidden(panelIDOrNode) {
|
|
return promisePanelEvent(panelIDOrNode, "popuphidden");
|
|
}
|
|
|
|
function promisePanelEvent(panelIDOrNode, eventType) {
|
|
return new Promise(resolve => {
|
|
let panel = panelIDOrNode;
|
|
if (typeof panel == "string") {
|
|
panel = document.getElementById(panelIDOrNode);
|
|
if (!panel) {
|
|
throw new Error(`Panel with ID "${panelIDOrNode}" does not exist.`);
|
|
}
|
|
}
|
|
if ((eventType == "popupshown" && panel.state == "open") ||
|
|
(eventType == "popuphidden" && panel.state == "closed")) {
|
|
executeSoon(resolve);
|
|
return;
|
|
}
|
|
panel.addEventListener(eventType, () => {
|
|
executeSoon(resolve);
|
|
}, { once: true });
|
|
});
|
|
}
|
|
|
|
function promisePageActionViewShown() {
|
|
info("promisePageActionViewShown waiting for ViewShown");
|
|
return BrowserTestUtils.waitForEvent(BrowserPageActions.panelNode, "ViewShown").then(async event => {
|
|
let panelViewNode = event.originalTarget;
|
|
await promisePageActionViewChildrenVisible(panelViewNode);
|
|
return panelViewNode;
|
|
});
|
|
}
|
|
|
|
function promisePageActionViewChildrenVisible(panelViewNode) {
|
|
return promiseNodeVisible(panelViewNode.firstElementChild.firstElementChild);
|
|
}
|
|
|
|
function promiseNodeVisible(node) {
|
|
info(`promiseNodeVisible waiting, node.id=${node.id} node.localeName=${node.localName}\n`);
|
|
let dwu = window.windowUtils;
|
|
return BrowserTestUtils.waitForCondition(() => {
|
|
let bounds = dwu.getBoundsWithoutFlushing(node);
|
|
if (bounds.width > 0 && bounds.height > 0) {
|
|
info(`promiseNodeVisible OK, node.id=${node.id} node.localeName=${node.localName}\n`);
|
|
return true;
|
|
}
|
|
return false;
|
|
});
|
|
}
|