mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 05:08:36 +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
107 lines
3.2 KiB
JavaScript
107 lines
3.2 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
// Functions that are automatically loaded as frame scripts for
|
|
// timeline tests.
|
|
|
|
const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
|
|
|
|
// Functions that look like mochitest functions but forward to the
|
|
// browser process.
|
|
|
|
this.ok = function(value, message) {
|
|
sendAsyncMessage("browser:test:ok", {
|
|
value: !!value,
|
|
message: message});
|
|
}
|
|
|
|
this.is = function(v1, v2, message) {
|
|
ok(v1 == v2, message);
|
|
}
|
|
|
|
this.info = function(message) {
|
|
sendAsyncMessage("browser:test:info", {message: message});
|
|
}
|
|
|
|
this.finish = function() {
|
|
sendAsyncMessage("browser:test:finish");
|
|
}
|
|
|
|
/* Start a task that runs some timeline tests in the ordinary way.
|
|
*
|
|
* @param array tests
|
|
* The tests to run. This is an array where each element
|
|
* is of the form { desc, searchFor, setup, check }.
|
|
*
|
|
* desc is the test description, a string.
|
|
* searchFor is a string or a function
|
|
* If a string, then when a marker with this name is
|
|
* found, marker-reading is stopped.
|
|
* If a function, then the accumulated marker array is
|
|
* passed to it, and marker reading stops when it returns
|
|
* true.
|
|
* setup is a function that takes the docshell as an argument.
|
|
* It should start the test.
|
|
* check is a function that takes an array of markers
|
|
* as an argument and checks the results of the test.
|
|
*/
|
|
this.timelineContentTest = function(tests) {
|
|
(async function() {
|
|
let docShell = content.docShell;
|
|
|
|
info("Start recording");
|
|
docShell.recordProfileTimelineMarkers = true;
|
|
|
|
for (let {desc, searchFor, setup, check} of tests) {
|
|
|
|
info("Running test: " + desc);
|
|
|
|
info("Flushing the previous markers if any");
|
|
docShell.popProfileTimelineMarkers();
|
|
|
|
info("Running the test setup function");
|
|
let onMarkers = timelineWaitForMarkers(docShell, searchFor);
|
|
setup(docShell);
|
|
info("Waiting for new markers on the docShell");
|
|
let markers = await onMarkers;
|
|
|
|
// Cycle collection markers are non-deterministic, and none of these tests
|
|
// expect them to show up.
|
|
markers = markers.filter(m => !m.name.includes("nsCycleCollector"));
|
|
|
|
info("Running the test check function");
|
|
check(markers);
|
|
}
|
|
|
|
info("Stop recording");
|
|
docShell.recordProfileTimelineMarkers = false;
|
|
finish();
|
|
})();
|
|
}
|
|
|
|
function timelineWaitForMarkers(docshell, searchFor) {
|
|
if (typeof(searchFor) == "string") {
|
|
let searchForString = searchFor;
|
|
let f = function (markers) {
|
|
return markers.some(m => m.name == searchForString);
|
|
};
|
|
searchFor = f;
|
|
}
|
|
|
|
return new Promise(function(resolve, reject) {
|
|
let waitIterationCount = 0;
|
|
let maxWaitIterationCount = 10; // Wait for 2sec maximum
|
|
let markers = [];
|
|
|
|
setTimeout(function timeoutHandler() {
|
|
let newMarkers = docshell.popProfileTimelineMarkers();
|
|
markers = [...markers, ...newMarkers];
|
|
if (searchFor(markers) || waitIterationCount > maxWaitIterationCount) {
|
|
resolve(markers);
|
|
} else {
|
|
setTimeout(timeoutHandler, 200);
|
|
waitIterationCount++;
|
|
}
|
|
}, 200);
|
|
});
|
|
}
|