wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1157255: Use typeof to determine MarionetteObj exports

Browse Source 
This makes us not rely on try…catch logic to export MarionetteObj
properties and functions on the sandbox.

The patch also cleans up a few more details on
createExecuteContentSandbox.

r=dburns
This commit is contained in:
Andreas Tolfsen 2015-04-28 19:16:46 +01:00
parent 5791ead1d5
commit e2a266155d
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
testing/marionette/listener.js
View File

@ -456,43 +456,44 @@ function checkForInterrupted() {
/**
* Returns a content sandbox that can be used by the execute_foo functions.
*/
function createExecuteContentSandbox(aWindow, timeout) {
let sandbox = new Cu.Sandbox(aWindow, {sandboxPrototype: aWindow});
function createExecuteContentSandbox(win, timeout) {
let mn = new Marionette(
this,
win,
"content",
marionetteLogObj,
timeout,
heartbeatCallback,
marionetteTestName);
mn.runEmulatorCmd = (cmd, cb) => this.runEmulatorCmd(cmd, cb);
mn.runEmulatorShell = (args, cb) => this.runEmulatorShell(args, cb);
let sandbox = new Cu.Sandbox(win, {sandboxPrototype: win});
sandbox.global = sandbox;
sandbox.window = aWindow;
sandbox.window = win;
sandbox.document = sandbox.window.document;
sandbox.navigator = sandbox.window.navigator;
sandbox.testUtils = utils;
sandbox.asyncTestCommandId = asyncTestCommandId;
sandbox.marionette = mn;
let marionette = new Marionette(this, aWindow, "content",
marionetteLogObj, timeout,
heartbeatCallback,
marionetteTestName);
marionette.runEmulatorCmd = (cmd, cb) => this.runEmulatorCmd(cmd, cb);
marionette.runEmulatorShell = (args, cb) => this.runEmulatorShell(args, cb);
sandbox.marionette = marionette;
marionette.exports.forEach(function(fn) {
try {
sandbox[fn] = marionette[fn].bind(marionette);
}
catch(e) {
sandbox[fn] = marionette[fn];
mn.exports.forEach(fn => {
if (typeof mn[fn] == "function") {
sandbox[fn] = mn[fn].bind(mn);
} else {
sandbox[fn] = mn[fn];
}
});
if (aWindow.wrappedJSObject.SpecialPowers != undefined) {
XPCOMUtils.defineLazyGetter(sandbox, 'SpecialPowers', function() {
return aWindow.wrappedJSObject.SpecialPowers;
});
}
else {
XPCOMUtils.defineLazyGetter(sandbox, 'SpecialPowers', function() {
return new SpecialPowers(aWindow);
});
let specialPowersFn;
if (typeof win.wrappedJSObject.SpecialPowers != "undefined") {
specialPowersFn = () => win.wrappedJSObject.SpecialPowers;
} else {
specialPowersFn = () => new SpecialPowers(win);
}
XPCOMUtils.defineLazyGetter(sandbox, "SpecialPowers", specialPowersFn);
sandbox.asyncComplete = function(obj, id) {
sandbox.asyncComplete = (obj, id) => {
if (id == asyncTestCommandId) {
curFrame.removeEventListener("unload", onunload, false);
curFrame.clearTimeout(asyncTestTimeoutId);
@ -525,9 +526,9 @@ function createExecuteContentSandbox(aWindow, timeout) {
sandbox.finish = function() {
if (asyncTestRunning) {
sandbox.asyncComplete(marionette.generate_results(), sandbox.asyncTestCommandId);
sandbox.asyncComplete(mn.generate_results(), sandbox.asyncTestCommandId);
} else {
return marionette.generate_results();
return mn.generate_results();
}
};
sandbox.marionetteScriptFinished = val =>