Backed out changeset 16da792be5f8 (bug 975042)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 21 Mar 2014 08:47:40 +0100
changeset 193203 7f619d0f71a77f642b72c509dfe0080a83f5ac4f
parent 193202 460de03b00cdf986806fee827c8b5dae804ecbcb
child 193204 00d167ba24d8af1693239bb88cdceb14ac113b1a
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs975042
milestone31.0a1
backs out16da792be5f817ab3dcf720936839e61498b68e6
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 16da792be5f8 (bug 975042)
js/xpconnect/tests/chrome/test_expandosharing.xul
js/xpconnect/tests/mochitest/file_expandosharing.html
--- a/js/xpconnect/tests/chrome/test_expandosharing.xul
+++ b/js/xpconnect/tests/chrome/test_expandosharing.xul
@@ -50,37 +50,37 @@ https://bugzilla.mozilla.org/show_bug.cg
     // C: sub1.test1.example.org
     window.gWinA1 = document.getElementById('frameA1').contentWindow;
     window.gWinA2 = document.getElementById('frameA2').contentWindow;
     window.gWinA3 = document.getElementById('frameA3').contentWindow;
     window.gWinB = document.getElementById('frameB').contentWindow;
     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();
 
     SimpleTest.finish();
   }
 
   // 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) {
 
     // This gets both run in this scope and the sandbox scope.
     var name = "harness";
     function placeExpando() {
       target.prop = name;
--- a/js/xpconnect/tests/mochitest/file_expandosharing.html
+++ b/js/xpconnect/tests/mochitest/file_expandosharing.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <head>
 <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) {
     target[name] = val;
   }
 
   // If val === null, then we shouldn't have access.
   function checkExpando(name, val, target, msg) {