mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 21:58:41 +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
104 lines
3.3 KiB
JavaScript
104 lines
3.3 KiB
JavaScript
// Bug 1117242: Test calling SavedFrame getters from globals that don't subsume
|
|
// that frame's principals.
|
|
|
|
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
|
|
addDebuggerToGlobal(this);
|
|
|
|
const lowP = Cc["@mozilla.org/nullprincipal;1"].createInstance(Ci.nsIPrincipal);
|
|
const midP = [lowP, "http://other.com"];
|
|
const highP = Cc["@mozilla.org/systemprincipal;1"].createInstance(Ci.nsIPrincipal);
|
|
|
|
const low = new Cu.Sandbox(lowP);
|
|
const mid = new Cu.Sandbox(midP);
|
|
const high = new Cu.Sandbox(highP);
|
|
|
|
function run_test() {
|
|
// Test that the priveleged view of a SavedFrame from a subsumed compartment
|
|
// is the same view that the subsumed compartment gets. Create the following
|
|
// chain of function calls (with some intermediate system-principaled frames
|
|
// due to implementation):
|
|
//
|
|
// low.lowF -> mid.midF -> high.highF -> high.saveStack
|
|
//
|
|
// Where high.saveStack gets monkey patched to create stacks in each of our
|
|
// sandboxes.
|
|
|
|
Cu.evalInSandbox("function highF() { return saveStack(); }", high);
|
|
|
|
mid.highF = () => high.highF();
|
|
Cu.evalInSandbox("function midF() { return highF(); }", mid);
|
|
|
|
low.midF = () => mid.midF();
|
|
Cu.evalInSandbox("function lowF() { return midF(); }", low);
|
|
|
|
const expected = [
|
|
{
|
|
sandbox: low,
|
|
frames: ["lowF"],
|
|
},
|
|
{
|
|
sandbox: mid,
|
|
frames: ["midF", "lowF"],
|
|
},
|
|
{
|
|
sandbox: high,
|
|
frames: ["getSavedFrameInstanceFromSandbox",
|
|
"saveStack",
|
|
"highF",
|
|
"run_test/mid.highF",
|
|
"midF",
|
|
"run_test/low.midF",
|
|
"lowF",
|
|
"run_test",
|
|
"_execute_test",
|
|
null],
|
|
}
|
|
];
|
|
|
|
for (let { sandbox, frames } of expected) {
|
|
high.saveStack = function saveStack() {
|
|
return getSavedFrameInstanceFromSandbox(sandbox);
|
|
};
|
|
|
|
const xrayStack = low.lowF();
|
|
equal(xrayStack.functionDisplayName, "getSavedFrameInstanceFromSandbox",
|
|
"Xrays should always be able to see everything.");
|
|
|
|
let waived = Cu.waiveXrays(xrayStack);
|
|
do {
|
|
ok(frames.length,
|
|
"There should still be more expected frames while we have actual frames.");
|
|
equal(waived.functionDisplayName, frames.shift(),
|
|
"The waived wrapper should give us the stack's compartment's view.");
|
|
waived = waived.parent;
|
|
} while (waived);
|
|
}
|
|
}
|
|
|
|
// Get a SavedFrame instance from inside the given sandbox.
|
|
//
|
|
// We can't use Cu.getJSTestingFunctions().saveStack() because Cu isn't
|
|
// available to sandboxes that don't have the system principal. The easiest way
|
|
// to get the SavedFrame is to use the Debugger API to track allocation sites
|
|
// and then do an allocation.
|
|
function getSavedFrameInstanceFromSandbox(sandbox) {
|
|
const dbg = new Debugger(sandbox);
|
|
|
|
dbg.memory.trackingAllocationSites = true;
|
|
Cu.evalInSandbox("new Object", sandbox);
|
|
const allocs = dbg.memory.drainAllocationsLog();
|
|
dbg.memory.trackingAllocationSites = false;
|
|
|
|
ok(allocs[0], "We should observe the allocation");
|
|
const { frame } = allocs[0];
|
|
|
|
if (sandbox !== high) {
|
|
ok(Cu.isXrayWrapper(frame), "`frame` should be an xray...");
|
|
equal(Object.prototype.toString.call(Cu.waiveXrays(frame)),
|
|
"[object SavedFrame]",
|
|
"...and that xray should wrap a SavedFrame");
|
|
}
|
|
|
|
return frame;
|
|
}
|
|
|