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 1051224 - Use the opt-out for the webconsole helpers. r=ochameau

Browse Source
This commit is contained in:
Bobby Holley 2014-09-03 13:02:36 -07:00
parent c5fd483020
commit ec4a87485a
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
toolkit/devtools/server/actors/webconsole.js
View File

@ -933,13 +933,31 @@ WebConsoleActor.prototype =
};
JSTermHelpers(helpers);
// Make sure the helpers can be used during eval.
let evalWindow = this.evalWindow;
function maybeExport(obj, name) {
if (typeof obj[name] != "function") {
return;
}
// By default, chrome-implemented functions that are exposed to content
// refuse to accept arguments that are cross-origin for the caller. This
// is generally the safe thing, but causes problems for certain console
// helpers like cd(), where we users sometimes want to pass a cross-origin
// window. To circumvent this restriction, we use exportFunction along
// with a special option designed for this purpose. See bug 1051224.
obj[name] =
Cu.exportFunction(obj[name], evalWindow, { allowCrossOriginArguments: true });
}
for (let name in helpers.sandbox) {
let desc = Object.getOwnPropertyDescriptor(helpers.sandbox, name);
if (desc.get || desc.set) {
continue;
maybeExport(desc, 'get');
maybeExport(desc, 'set');
maybeExport(desc, 'value');
if (desc.value) {
// Make sure the helpers can be used during eval.
desc.value = aDebuggerGlobal.makeDebuggeeValue(desc.value);
}
helpers.sandbox[name] = aDebuggerGlobal.makeDebuggeeValue(desc.value);
Object.defineProperty(helpers.sandbox, name, desc);
}
return helpers;
},

2
toolkit/devtools/webconsole/utils.js
View File

@ -1583,7 +1583,7 @@ function JSTermHelpers(aOwner)
return aOwner.makeDebuggeeValue(aOwner.selectedNode)
},
enumerable: true,
configurable: false
configurable: true
});
/**