Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 64add63

Browse files
committed
Bug 1624705 - Let Xray waiver nuking for local window proxies ride the trains. r=kmag
This has been on Nightly for almost a year and I don't think we've seen any breakage, so I think it is time to let it ride the trains. Differential Revision: https://phabricator.services.mozilla.com/D104555
1 parent 5bacc6c commit 64add63

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

dom/base/nsGlobalWindowOuter.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2296,11 +2296,7 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
22962296
JS::PrivateValue(nullptr));
22972297
js::SetProxyReservedSlot(obj, HOLDER_WEAKMAP_SLOT, JS::UndefinedValue());
22982298

2299-
#ifdef NIGHTLY_BUILD
23002299
outerObject = xpc::TransplantObjectNukingXrayWaiver(cx, obj, outerObject);
2301-
#else
2302-
outerObject = xpc::TransplantObject(cx, obj, outerObject);
2303-
#endif
23042300

23052301
if (!outerObject) {
23062302
mBrowsingContext->ClearWindowProxy();

js/xpconnect/tests/chrome/test_bug773962.xhtml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=773962
6060
ok(true, "Didn't crash!");
6161

6262
// Now, make sure everything is set up how we expect.
63-
const {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
64-
if (AppConstants.NIGHTLY_BUILD) {
65-
ok(Cu.isDeadWrapper(win1Waiver), "window waiver should go away after navigation");
66-
} else {
67-
ok(win1Waiver === win1.wrappedJSObject, "waivers still work");
68-
ok(XPCNativeWrapper(win1Waiver) === win1, "waivers still work");
69-
}
63+
ok(Cu.isDeadWrapper(win1Waiver), "window waiver should go away after navigation");
7064
ok(node1Waiver === node1.wrappedJSObject, "waivers still work");
7165
ok(XPCNativeWrapper(node1Waiver) === node1, "waivers still work");
7266

0 commit comments

Comments
 (0)