mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 868996. Allow setting opener on the window to non-null, for just the lifetime of the page. r=bholley
This commit is contained in:
Boris Zbarsky
parent
ebeb2778f7
commit
24ef2562af
@ -3885,9 +3885,37 @@ nsGlobalWindow::GetOpener(nsIDOMWindow** aOpener)
|
||||
NS_IMETHODIMP
|
||||
nsGlobalWindow::SetOpener(nsIDOMWindow* aOpener)
|
||||
{
|
||||
// check if we were called from a privileged chrome script.
|
||||
// If not, opener is settable only to null.
|
||||
// Check if we were called from a privileged chrome script. If not, and if
|
||||
// aOpener is not null, just define aOpener on our inner window's JS object,
|
||||
// wapped into the current compartment so that for Xrays we define on the Xray
|
||||
// expando object, but don't set it on the outer window, so that it'll get
|
||||
// reset on navigation. This is just like replaceable properties, but we're
|
||||
// not quite readonly.
|
||||
if (aOpener && !nsContentUtils::IsCallerChrome()) {
|
||||
// JS_WrapObject will outerize, so we don't care if aOpener is an inner.
|
||||
nsCOMPtr<nsIGlobalObject> glob = do_QueryInterface(aOpener);
|
||||
NS_ENSURE_STATE(glob);
|
||||
|
||||
AutoJSContext cx;
|
||||
JSAutoRequest ar(cx);
|
||||
// Note we explicitly do NOT enter any particular compartment here; we want
|
||||
// the caller compartment in cases when we have a caller, so that we define
|
||||
// expandos on Xrays as needed.
|
||||
|
||||
JS::Rooted<JSObject*> otherObj(cx, glob->GetGlobalJSObject());
|
||||
NS_ENSURE_STATE(otherObj);
|
||||
|
||||
JS::Rooted<JSObject*> thisObj(cx, mJSObject);
|
||||
NS_ENSURE_STATE(mJSObject);
|
||||
|
||||
if (!JS_WrapObject(cx, otherObj.address()) ||
|
||||
!JS_WrapObject(cx, thisObj.address()) ||
|
||||
!JS_DefineProperty(cx, thisObj, "opener", JS::ObjectValue(*otherObj),
|
||||
JS_PropertyStub, JS_StrictPropertyStub,
|
||||
JSPROP_ENUMERATE)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ MOCHITEST_FILES = \
|
||||
test_domcursor.html \
|
||||
test_named_frames.html \
|
||||
test_Image_constructor.html \
|
||||
test_setting_opener.html \
|
||||
$(NULL)
|
||||
|
||||
MOCHITEST_CHROME_FILES = \
|
||||
|
||||
106
dom/base/test/test_setting_opener.html
Normal file
106
dom/base/test/test_setting_opener.html
Normal file
@ -0,0 +1,106 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=868996
|
||||
-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Test for Bug 868996</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
||||
<script type="application/javascript">
|
||||
|
||||
/** Test for Bug 868996 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
||||
var sb1, sb2;
|
||||
var Cu = SpecialPowers.Cu;
|
||||
|
||||
function testOpenerSet() {
|
||||
// Use setTimeout to make the relevant onerror run in this window
|
||||
var win = window.open("data:text/html,<script>opener.setTimeout(opener.basicOpenerTest, 0, this)</" + "script>");
|
||||
// A sandbox for the window
|
||||
sb1 = new Cu.Sandbox(win, {wantXrays: true })
|
||||
sb1.win = win
|
||||
// And a sandbox using the expanded principal.
|
||||
sb2 = new Cu.Sandbox([win], {wantXrays: true })
|
||||
sb2.win = win
|
||||
}
|
||||
|
||||
function evalsb(str, sb) {
|
||||
// Have to unwrap() to get objects we care about
|
||||
return SpecialPowers.unwrap(Cu.evalInSandbox(str, sb));
|
||||
}
|
||||
|
||||
function basicOpenerTest(win) {
|
||||
is(win.opener, window, "Opening a window should give it the right opener");
|
||||
is(evalsb("win.opener", sb1), window,
|
||||
"Reading opener in sandbox 1 should work");
|
||||
is(evalsb("win.opener", sb2), window,
|
||||
"Reading opener in sandbox 2 should work");
|
||||
|
||||
win.opener = $("x").contentWindow;
|
||||
evalsb("win.opener = win.opener.document.getElementById('y').contentWindow", sb1);
|
||||
evalsb("win.opener = win.opener.document.getElementById('z').contentWindow", sb2);
|
||||
|
||||
is(win.opener, $("x").contentWindow, "Should be able to set an opener to a different window");
|
||||
is(evalsb("win.opener", sb1), $("y").contentWindow,
|
||||
"Should be able to set the opener to a different window in a sandbox one");
|
||||
is(evalsb("win.opener", sb2), $("z").contentWindow,
|
||||
"Should be able to set the opener to a different window in a sandbox two");
|
||||
|
||||
win.location = "data:text/html,<script>opener.setTimeout(opener.continueOpenerTest, 0, this);</" + "script>";
|
||||
}
|
||||
|
||||
function continueOpenerTest(win) {
|
||||
is(win.opener, window, "Navigating a window should have reset the opener we stashed on it temporarily");
|
||||
is(evalsb("win.opener", sb1), window,
|
||||
"Navigating a window should have reset the opener in sb1");
|
||||
is(evalsb("win.opener", sb2), window,
|
||||
"Navigating a window should have reset the opener in sb2");
|
||||
|
||||
win.opener = null;
|
||||
is(win.opener, null, "Should be able to set the opener to null");
|
||||
is(evalsb("win.opener", sb1), null,
|
||||
"Setting the opener to null should be visible in sb1");
|
||||
is(evalsb("win.opener", sb2), null,
|
||||
"Setting the opener to null should be visible in sb2");
|
||||
|
||||
win.location = "data:text/html,Loaded";
|
||||
// Now poll for that load, since we have no way for the window to
|
||||
// communicate with us now
|
||||
setTimeout(checkForLoad, 0, win);
|
||||
}
|
||||
|
||||
function checkForLoad(win) {
|
||||
if (!win.document.documentElement ||
|
||||
win.document.documentElement.textContent != "Loaded") {
|
||||
setTimeout(checkForLoad, 0, win);
|
||||
return;
|
||||
}
|
||||
|
||||
is(win.opener, null, "Null opener should persist across navigations");
|
||||
is(evalsb("win.opener", sb1), null,
|
||||
"Null opener should persist across navigations in sb1");
|
||||
is(evalsb("win.opener", sb2), null,
|
||||
"Null opener should persist across navigations in sb2");
|
||||
|
||||
win.close();
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
addLoadEvent(testOpenerSet);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=868996">Mozilla Bug 868996</a>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
<iframe id="x"></iframe>
|
||||
<iframe id="y"></iframe>
|
||||
<iframe id="z"></iframe>
|
||||
</div>
|
||||
<pre id="test">
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user