mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 853283 - Grab the window directly from the navigator in nsNavigatorSH::NewResolve. r=mrbkap

This commit is contained in:
Bobby Holley 2013-03-21 08:20:41 -07:00
Родитель f5535817f0
Коммит 8e9287775b
3 изменённых файлов: 45 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
dom/base/nsDOMClassInfo.cpp
Просмотреть файл

@ -5726,14 +5726,9 @@ nsNavigatorSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
nsCOMPtr<nsIDOMGlobalPropertyInitializer> gpi(do_QueryInterface(native));
if (gpi) {
JSObject *global = JS_GetGlobalForObject(cx, obj);
nsISupports *globalNative = XPConnect()->GetNativeOfWrapper(cx, global);
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(globalNative);
if (!window) {
return NS_ERROR_UNEXPECTED;
}
nsCOMPtr<nsIDOMNavigator> navigator = do_QueryWrappedNative(wrapper);
nsIDOMWindow *window = static_cast<Navigator*>(navigator.get())->GetWindow();
NS_ENSURE_TRUE(window, NS_ERROR_UNEXPECTED);
rv = gpi->Init(window, &prop_val);
NS_ENSURE_SUCCESS(rv, rv);

1
js/xpconnect/tests/chrome/Makefile.in
Просмотреть файл

@ -47,6 +47,7 @@ MOCHITEST_CHROME_FILES = \
test_bug799348.xul \
test_bug801241.xul \
test_bug812415.xul \
test_bug853283.xul \
test_APIExposer.xul \
test_chrometoSource.xul \
outoflinexulscript.js \

41
js/xpconnect/tests/chrome/test_bug853283.xul Normal file
Просмотреть файл

@ -0,0 +1,41 @@
<?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=853283
-->
<window title="Mozilla Bug 853283"
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=853283"
target="_blank">Mozilla Bug 853283</a>
</body>
<!-- test code goes here -->
<script type="application/javascript">
<![CDATA[
/** Test nsNavigatorSH::NewResolve in conjunction with Xrays.**/
SimpleTest.waitForExplicitFinish();
const Cu = Components.utils;
function go() {
// This chrome document already has Xrays to the content scope, but we use a
// a sandbox anyway to make sure that the global in play here isn't an
// nsIDOMWindow. Otherwise, the resolve hook might just end up squeaking by
// with the chrome window.
var iwin = $('ifr').contentWindow;
var sb = new Cu.Sandbox(window);
sb.iwin = iwin;
sb.ok = ok;
Cu.evalInSandbox('try {iwin.navigator.mozApps; ok(true, "Didnt throw"); } catch (e) { ok(false, "Threw: " + e);}', sb);
SimpleTest.finish();
}
]]>
</script>
<iframe id="ifr" onload="go();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_empty.html" />
</window>