Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-14 14:02:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changesets b9f7fd0996f0 and c0ab16b6003e (bug 860494) for mochitest failures on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-17 12:00:20 -04:00
parent 78dad25bc3
commit 040af911d4
5 changed files with 13 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/xpconnect/tests/chrome/Makefile.in
View File

@ -50,7 +50,6 @@ MOCHITEST_CHROME_FILES = \
test_bug812415.xul \
test_bug853283.xul \
test_bug853571.xul \
test_bug860494.xul \
test_APIExposer.xul \
test_chrometoSource.xul \
outoflinexulscript.js \

37
js/xpconnect/tests/chrome/test_bug860494.xul
View File

@ -1,37 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=860494
-->
<window title="Mozilla Bug 860494"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=860494"
target="_blank">Mozilla Bug 860494</a>
</body>
<!-- test code goes here -->
<script type="application/javascript">
<![CDATA[
/** Test for Bug 860494 **/
SimpleTest.waitForExplicitFinish();
function go() {
var iwin = $('ifr').contentWindow;
// NB: mochitest-chrome actually runs the test as a content docshell.
is(iwin.top, window.top, "iframe names shouldn't shadow |top| via Xray");
is(iwin.parent, window, "iframe names shouldn't shadow |parent| via Xray");
ok(!!/http/.exec(iwin.location), "iframe names shouldn't shadow |location| via Xray");
is(iwin.length, 5, "iframe names shouldn't shadow |length| via Xray");
is(iwin.window, iwin, "iframe names shouldn't shadow |window| via Xray");
SimpleTest.finish();
}
]]>
</script>
<iframe id="ifr" type="content" onload="go();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_bug860494.html" />
</window>

1
js/xpconnect/tests/mochitest/Makefile.in
View File

@ -92,7 +92,6 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \
test_bug803730.html \
test_bug809547.html \
test_bug809674.html \
file_bug860494.html \
file_crosscompartment_weakmap.html \
test_crosscompartment_weakmap.html \
$(NULL)

14
js/xpconnect/tests/mochitest/file_bug860494.html
View File

@ -1,14 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
</head>
<body>
<iframe name="top"></iframe>
<iframe name="parent"></iframe>
<iframe name="location"></iframe>
<iframe name="length"></iframe>
<iframe name="window"></iframe>
</body>
</html>

27
js/xpconnect/wrappers/XrayWrapper.cpp
View File

@ -1477,25 +1477,14 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, HandleObject wra
return true;
}
if (!JS_GetPropertyDescriptorById(cx, holder, id, 0, desc))
return false;
if (desc->obj) {
desc->obj = wrapper;
return true;
}
// Nothing in the cache. Call through, and cache the result.
if (!Traits::resolveNativeProperty(cx, wrapper, holder, id, desc, flags))
return false;
// We need to handle named access on the Window somewhere other than
// Traits::resolveOwnProperty, because per spec it happens on the Global
// Scope Polluter and thus the resulting properties are non-|own|. However,
// we're set up (above) to cache (on the holder) anything that comes out of
// we're set up (below) to cache (on the holder) anything that comes out of
// resolveNativeProperty, which we don't want for something dynamic like
// named access. So we just handle it separately here.
// named access. So we just handle it here.
nsGlobalWindow *win;
if (!desc->obj && Traits::Type == XrayForWrappedNative && JSID_IS_STRING(id) &&
if (Traits::Type == XrayForWrappedNative && JSID_IS_STRING(id) &&
(win = static_cast<nsGlobalWindow*>(As<nsPIDOMWindow>(wrapper))))
{
nsCOMPtr<nsIDOMWindow> childDOMWin = win->GetChildWindow(id);
@ -1511,6 +1500,16 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, HandleObject wra
}
}
if (!JS_GetPropertyDescriptorById(cx, holder, id, 0, desc))
return false;
if (desc->obj) {
desc->obj = wrapper;
return true;
}
// Nothing in the cache. Call through, and cache the result.
if (!Traits::resolveNativeProperty(cx, wrapper, holder, id, desc, flags))
return false;
if (!desc->obj &&
id == nsXPConnect::GetRuntimeInstance()->GetStringID(XPCJSRuntime::IDX_TO_STRING))