mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 13:48:23 +02:00
***
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
167 lines
5.4 KiB
JavaScript
167 lines
5.4 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
"use strict";
|
|
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
var {AsyncShutdown} = ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm");
|
|
|
|
var asyncShutdownService = Cc["@mozilla.org/async-shutdown-service;1"].
|
|
getService(Ci.nsIAsyncShutdownService);
|
|
|
|
|
|
Services.prefs.setBoolPref("toolkit.asyncshutdown.testing", true);
|
|
|
|
/**
|
|
* Utility function used to provide the same API for various sources
|
|
* of async shutdown barriers.
|
|
*
|
|
* @param {string} kind One of
|
|
* - "phase" to test an AsyncShutdown phase;
|
|
* - "barrier" to test an instance of AsyncShutdown.Barrier;
|
|
* - "xpcom-barrier" to test an instance of nsIAsyncShutdownBarrier;
|
|
* - "xpcom-barrier-unwrapped" to test the field `jsclient` of a nsIAsyncShutdownClient.
|
|
*
|
|
* @return An object with the following methods:
|
|
* - addBlocker() - the same method as AsyncShutdown phases and barrier clients
|
|
* - wait() - trigger the resolution of the lock
|
|
*/
|
|
function makeLock(kind) {
|
|
if (kind == "phase") {
|
|
let topic = "test-Phase-" + ++makeLock.counter;
|
|
let phase = AsyncShutdown._getPhase(topic);
|
|
return {
|
|
addBlocker(...args) {
|
|
return phase.addBlocker(...args);
|
|
},
|
|
removeBlocker(blocker) {
|
|
return phase.removeBlocker(blocker);
|
|
},
|
|
wait() {
|
|
Services.obs.notifyObservers(null, topic);
|
|
return Promise.resolve();
|
|
},
|
|
};
|
|
} else if (kind == "barrier") {
|
|
let name = "test-Barrier-" + ++makeLock.counter;
|
|
let barrier = new AsyncShutdown.Barrier(name);
|
|
return {
|
|
addBlocker: barrier.client.addBlocker,
|
|
removeBlocker: barrier.client.removeBlocker,
|
|
wait() {
|
|
return barrier.wait();
|
|
},
|
|
};
|
|
} else if (kind == "xpcom-barrier") {
|
|
let name = "test-xpcom-Barrier-" + ++makeLock.counter;
|
|
let barrier = asyncShutdownService.makeBarrier(name);
|
|
return {
|
|
addBlocker(blockerName, condition, state) {
|
|
if (condition == null) {
|
|
// Slight trick as `null` or `undefined` cannot be used as keys
|
|
// for `xpcomMap`. Note that this has no incidence on the result
|
|
// of the test as the XPCOM interface imposes that the condition
|
|
// is a method, so it cannot be `null`/`undefined`.
|
|
condition = "<this case can't happen with the xpcom interface>";
|
|
}
|
|
let blocker = makeLock.xpcomMap.get(condition);
|
|
if (!blocker) {
|
|
blocker = {
|
|
name: blockerName,
|
|
state,
|
|
blockShutdown(aBarrierClient) {
|
|
return (async function() {
|
|
try {
|
|
if (typeof condition == "function") {
|
|
await Promise.resolve(condition());
|
|
} else {
|
|
await Promise.resolve(condition);
|
|
}
|
|
} finally {
|
|
aBarrierClient.removeBlocker(blocker);
|
|
}
|
|
})();
|
|
},
|
|
};
|
|
makeLock.xpcomMap.set(condition, blocker);
|
|
}
|
|
let {fileName, lineNumber, stack} = (new Error());
|
|
return barrier.client.addBlocker(blocker, fileName, lineNumber, stack);
|
|
},
|
|
removeBlocker(condition) {
|
|
let blocker = makeLock.xpcomMap.get(condition);
|
|
if (!blocker) {
|
|
return;
|
|
}
|
|
barrier.client.removeBlocker(blocker);
|
|
},
|
|
wait() {
|
|
return new Promise(resolve => {
|
|
barrier.wait(resolve);
|
|
});
|
|
},
|
|
};
|
|
} else if ("unwrapped-xpcom-barrier") {
|
|
let name = "unwrapped-xpcom-barrier-" + ++makeLock.counter;
|
|
let barrier = asyncShutdownService.makeBarrier(name);
|
|
let client = barrier.client.jsclient;
|
|
return {
|
|
addBlocker: client.addBlocker,
|
|
removeBlocker: client.removeBlocker,
|
|
wait() {
|
|
return new Promise(resolve => {
|
|
barrier.wait(resolve);
|
|
});
|
|
},
|
|
};
|
|
}
|
|
throw new TypeError("Unknown kind " + kind);
|
|
}
|
|
makeLock.counter = 0;
|
|
makeLock.xpcomMap = new Map(); // Note: Not a WeakMap as we wish to handle non-gc-able keys (e.g. strings)
|
|
|
|
/**
|
|
* An asynchronous task that takes several ticks to complete.
|
|
*
|
|
* @param {*=} resolution The value with which the resulting promise will be
|
|
* resolved once the task is complete. This may be a rejected promise,
|
|
* in which case the resulting promise will itself be rejected.
|
|
* @param {object=} outResult An object modified by side-effect during the task.
|
|
* Initially, its field |isFinished| is set to |false|. Once the task is
|
|
* complete, its field |isFinished| is set to |true|.
|
|
*
|
|
* @return {promise} A promise fulfilled once the task is complete
|
|
*/
|
|
function longRunningAsyncTask(resolution = undefined, outResult = {}) {
|
|
outResult.isFinished = false;
|
|
if (!("countFinished" in outResult)) {
|
|
outResult.countFinished = 0;
|
|
}
|
|
return new Promise(resolve => {
|
|
do_timeout(100, function() {
|
|
++outResult.countFinished;
|
|
outResult.isFinished = true;
|
|
resolve(resolution);
|
|
});
|
|
});
|
|
}
|
|
|
|
function get_exn(f) {
|
|
try {
|
|
f();
|
|
return null;
|
|
} catch (ex) {
|
|
return ex;
|
|
}
|
|
}
|
|
|
|
function do_check_exn(exn, constructor) {
|
|
Assert.notEqual(exn, null);
|
|
if (exn.name == constructor) {
|
|
Assert.equal(exn.constructor.name, constructor);
|
|
return;
|
|
}
|
|
info("Wrong error constructor");
|
|
info(exn.constructor.name);
|
|
info(exn.stack);
|
|
Assert.ok(false);
|
|
}
|