Backed out changeset 31f52909af17 (bug 1575711) for failing test_bug1036214.html on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Mon, 26 Aug 2019 20:50:21 +0300
changeset 553674 03a423fae99ef6fb5f43ede34e3611813eac3c45
parent 553673 2c3c21948ede8595b54e4ac1af5f8aed6bcc74cb
child 553675 c906462eddc70b5864e8fe07f3504b381e018cb7
push id2165
push userffxbld-merge
push dateMon, 14 Oct 2019 16:30:58 +0000
treeherdermozilla-release@0eae18af659f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1575711, 1036214
milestone70.0a1
backs out31f52909af179bbd4c8b2185b771c531254324a7
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 31f52909af17 (bug 1575711) for failing test_bug1036214.html on a CLOSED TREE
dom/bindings/BindingUtils.cpp
dom/bindings/test/test_bug1036214.html
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -3278,22 +3278,16 @@ void AssertReturnTypeMatchesJitinfo(cons
       // Someone messed up their jitinfo type.
       MOZ_ASSERT(false, "Unexpected JSValueType stored in jitinfo");
       break;
   }
 }
 #endif
 
 bool CallerSubsumes(JSObject* aObject) {
-  // Remote object proxies are not CCWs, so unwrapping them does not get you
-  // their "real" principal, but we want to treat them like cross-origin objects
-  // when considering them as WebIDL arguments, for consistency.
-  if (IsRemoteObjectProxy(aObject)) {
-    return false;
-  }
   nsIPrincipal* objPrin =
       nsContentUtils::ObjectPrincipal(js::UncheckedUnwrap(aObject));
   return nsContentUtils::SubjectPrincipal()->Subsumes(objPrin);
 }
 
 nsresult UnwrapArgImpl(JSContext* cx, JS::Handle<JSObject*> src,
                        const nsIID& iid, void** ppArg) {
   if (!NS_IsMainThread()) {
--- a/dom/bindings/test/test_bug1036214.html
+++ b/dom/bindings/test/test_bug1036214.html
@@ -10,27 +10,21 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
   /* global TestInterfaceJS */
 
   /** Test for subsumes-checking |any| and |object| for js-implemented WebIDL. **/
   SimpleTest.waitForExplicitFinish();
   var xoObjects = [];
   function setup() {
-    // window[0] is same-process and cross-origin, even with Fission enabled.
     xoObjects.push(window[0]);
     xoObjects.push(window[0].location);
     xoObjects.push(SpecialPowers.unwrap(SpecialPowers.wrap(window[0]).document));
     xoObjects.push(SpecialPowers);
     xoObjects.push(SpecialPowers.wrap);
-    if (SpecialPowers.useRemoteSubframes) {
-      // window[1] is cross-origin and out of process, with Fission enabled.
-      xoObjects.push(window[1]);
-      xoObjects.push(window[1].location);
-    }
     SpecialPowers.pushPrefEnv({set: [["dom.expose_test_interfaces", true]]}, go);
   }
 
   function checkThrows(f, msg) {
     try {
       f();
       ok(false, "Should have thrown: " + msg);
     } catch (e) {
@@ -128,11 +122,10 @@ https://bugzilla.mozilla.org/show_bug.cg
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1036214">Mozilla Bug 1036214</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
 </pre>
 <iframe id="ifr" onload="setup();" src="http://test1.mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_empty.html"></iframe>
-<iframe id="ifr" onload="setup();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_empty.html"></iframe>
 </body>
 </html>