Bug 799875. Make the global scope polluter work even for qualified lookups. r=jst

--HG--
rename : dom/base/test/test_gsp-standards.html => dom/base/test/test_gsp-qualified.html
This commit is contained in:
Boris Zbarsky 2012-10-15 14:00:09 -04:00
Родитель a70866d490
Коммит 91b717e786
3 изменённых файлов: 42 добавлений и 4 удалений

Просмотреть файл

@ -5343,10 +5343,9 @@ nsWindowSH::GlobalScopePolluterNewResolve(JSContext *cx, JSHandleObject obj,
JSHandleId id, unsigned flags,
JSMutableHandleObject objp)
{
if (flags & (JSRESOLVE_ASSIGNING | JSRESOLVE_QUALIFIED) ||
!JSID_IS_STRING(id)) {
// Nothing to do here if we're assigning, doing a qualified resolve, or
// resolving a non-string property.
if ((flags & JSRESOLVE_ASSIGNING) || !JSID_IS_STRING(id)) {
// Nothing to do here if we're assigning or resolving a non-string
// property.
return JS_TRUE;
}

Просмотреть файл

@ -14,6 +14,7 @@ MOCHITEST_FILES = \
test_domrequest.html \
test_gsp-standards.html \
test_gsp-quirks.html \
test_gsp-qualified.html \
test_nondomexception.html \
test_screen_orientation.html \
$(NULL)

Просмотреть файл

@ -0,0 +1,38 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=799875
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 799875</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=799875">Mozilla Bug 799875</a>
<p id="display"></p>
<div id="content" style="display: none">
<iframe src="data:text/html,<div id='test2'>"></iframe>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 799875 **/
SimpleTest.waitForExplicitFinish();
addLoadEvent(function() {
is(window.test, document.getElementById("test"),
"Global scope polluter should map ids even when qualified")
isnot(document.getElementById("test"), null,
"Should have element");
is(window[0].test2, window[0].document.getElementById("test2"),
"Global scope polluter should map ids across globals");
isnot(window[0].document.getElementById("test2"), null,
"Should have element in subframe");
SimpleTest.finish();
});
</script>
</pre>
</body>
</html>