Backed out changeset 16da792be5f8 (bug 975042)

This commit is contained in:
Carsten "Tomcat" Book 2014-03-21 08:47:40 +01:00
parent 70e881bcbd
commit 6aaa55d6fb
2 changed files with 10 additions and 10 deletions

View File

@ -55,14 +55,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=758415
window.gWinC = document.getElementById('frameC').contentWindow;
// Test expando sharing with a JSM for different types of Xrays.
testJSM(XPCNativeWrapper(gWinC.wrappedJSObject.targetWN));
testJSM(XPCNativeWrapper(gWinC.wrappedJSObject.targetDOM));
testJSM(XPCNativeWrapper(gWinC.wrappedJSObject.targetJS));
testJSM(XPCNativeWrapper(gWinC.wrappedJSObject.targetWN), is);
testJSM(XPCNativeWrapper(gWinC.wrappedJSObject.targetNodeList), is);
testJSM(XPCNativeWrapper(gWinC.wrappedJSObject.targetXHR), is);
// Make sure sandboxes never share expandos with anyone else.
testSandbox(XPCNativeWrapper(gWinB.wrappedJSObject.targetWN));
testSandbox(XPCNativeWrapper(gWinB.wrappedJSObject.targetDOM));
testSandbox(XPCNativeWrapper(gWinB.wrappedJSObject.targetJS));
testSandbox(XPCNativeWrapper(gWinB.wrappedJSObject.targetNodeList));
testSandbox(XPCNativeWrapper(gWinB.wrappedJSObject.targetXHR));
// Test Content Xrays.
testContentXrays();
@ -71,11 +71,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=758415
}
// Make sure that expandos are shared between us and a JSM.
function testJSM(target) {
function testJSM(target, is_op) {
target.numProp = 42;
target.strProp = "foo";
target.objProp = { bar: "baz" };
checkFromJSM(target, is);
checkFromJSM(target, is_op);
}
function testSandbox(target) {

View File

@ -4,9 +4,9 @@
<script type="application/javascript">
function setup() {
// Set up different target objects for expandos, one for each binding type.
window.targetWN = window;
window.targetDOM = new XMLHttpRequest();
window.targetJS = new Date();
window.targetWN = document.body.firstChild;
window.targetNodeList = document.getElementsByTagName('span');
window.targetXHR = new XMLHttpRequest();
}
function placeExpando(name, val, target) {