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
70 lines
1.9 KiB
JavaScript
70 lines
1.9 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
"use strict";
|
|
|
|
const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
|
|
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
|
|
|
|
const testState = {
|
|
windows: [{
|
|
tabs: [
|
|
{ entries: [{ url: "about:blank", triggeringPrincipal_base64 }] },
|
|
],
|
|
}],
|
|
scratchpads: [
|
|
{ text: "text1", executionContext: 1 },
|
|
{ text: "", executionContext: 2, filename: "test.js" },
|
|
],
|
|
};
|
|
|
|
// only finish() when correct number of windows opened
|
|
var restoredStates = [];
|
|
function addState(state) {
|
|
restoredStates.push(state);
|
|
|
|
if (restoredStates.length == testState.scratchpads.length) {
|
|
ok(statesMatch(restoredStates, testState.scratchpads),
|
|
"Two scratchpad windows restored");
|
|
|
|
Services.ww.unregisterNotification(windowObserver);
|
|
finish();
|
|
}
|
|
}
|
|
|
|
function test() {
|
|
waitForExplicitFinish();
|
|
|
|
Services.ww.registerNotification(windowObserver);
|
|
|
|
SessionStore.setBrowserState(JSON.stringify(testState));
|
|
}
|
|
|
|
function windowObserver(subject, topic, data) {
|
|
if (topic == "domwindowopened") {
|
|
const win = subject.QueryInterface(Ci.nsIDOMWindow);
|
|
win.addEventListener("load", function() {
|
|
if (win.Scratchpad) {
|
|
win.Scratchpad.addObserver({
|
|
onReady() {
|
|
win.Scratchpad.removeObserver(this);
|
|
|
|
const state = win.Scratchpad.getState();
|
|
BrowserTestUtils.closeWindow(win).then(() => {
|
|
addState(state);
|
|
});
|
|
},
|
|
});
|
|
}
|
|
}, {once: true});
|
|
}
|
|
}
|
|
|
|
function statesMatch(restored, states) {
|
|
return states.every(function(state) {
|
|
return restored.some(function(restoredState) {
|
|
return state.filename == restoredState.filename &&
|
|
state.text == restoredState.text &&
|
|
state.executionContext == restoredState.executionContext;
|
|
});
|
|
});
|
|
}
|