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

Don't report bogus errors when DOMParser is used from chrome. Bug 429785, r+sr=sicking, a=dsicore

This commit is contained in:
bzbarsky@mit.edu 2008-04-24 14:54:42 -07:00
Родитель 3ce496786e
Коммит 9d923c0785
3 изменённых файлов: 78 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
content/base/src/nsDOMParser.cpp
Просмотреть файл

@ -232,10 +232,6 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
scriptHandlingObject,
getter_AddRefs(domDocument));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDocument> document(do_QueryInterface(domDocument));
if (!document) return NS_ERROR_FAILURE;
document->SetPrincipal(mPrincipal);
// Register as a load listener on the document
nsCOMPtr<nsPIDOMEventTarget> target(do_QueryInterface(domDocument));
@ -256,7 +252,8 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
nsDependentCString(contentType), nsnull);
NS_ENSURE_STATE(parserChannel);
parserChannel->SetOwner(mPrincipal);
// More principal-faking here
parserChannel->SetOwner(mOriginalPrincipal);
if (charset) {
parserChannel->SetContentCharset(nsDependentCString(charset));
@ -271,17 +268,20 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
// our event listener. Should that listener addition move to later
// than this call? Then we wouldn't need to mess around with
// SetPrincipal, etc, probably!
nsCOMPtr<nsIDocument> document(do_QueryInterface(domDocument));
if (!document) return NS_ERROR_FAILURE;
rv = document->StartDocumentLoad(kLoadAsData, parserChannel,
nsnull, nsnull,
getter_AddRefs(listener),
PR_FALSE);
// Make sure to give this document the right principal
document->SetPrincipal(mPrincipal);
// And the right base URI
// Make sure to give this document the right base URI
document->SetBaseURI(mBaseURI);
// And the right principal
document->SetPrincipal(mPrincipal);
if (NS_FAILED(rv) || !listener) {
return NS_ERROR_FAILURE;
}

1
content/base/test/chrome/Makefile.in
Просмотреть файл

@ -49,6 +49,7 @@ _TEST_FILES = \
_CHROME_FILES = \
test_bug421622.xul \
test_bug429785.xul \
test_bug430050.xul \
$(NULL)

68
content/base/test/chrome/test_bug429785.xul Normal file
Просмотреть файл

@ -0,0 +1,68 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=429785
-->
<window title="Mozilla Bug 429785"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js" />
<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=429785"
target="_blank">Mozilla Bug 429785</a>
</body>
<!-- test code goes here -->
<script type="application/javascript"><![CDATA[
/** Test for Bug 429785 **/
SimpleTest.waitForExplicitFinish();
var errorLogged = false;
const serv = Components.classes["@mozilla.org/consoleservice;1"]
.getService(Components.interfaces.nsIConsoleService);
var listener = {
QueryInteface : function(iid) {
if (!iid.equals(Components.interfaces.nsISupports) &&
!iid.equals(Components.interfaces.nsIConsoleListener)) {
throw Components.results.NS_NOINTERFACE;
}
return this;
},
observe : function (msg) { errorLogged = true; }
};
function step2() {
is(errorLogged, false, "Should be no errors");
serv.registerListener(listener);
try {
serv.logStringMessage("This is a test");
} finally {
serv.unregisterListener(listener);
}
setTimeout(step3, 0);
}
function step3() {
is(errorLogged, true, "Should see errors when they happen");
SimpleTest.finish();
}
serv.registerListener(listener);
try {
var p = new DOMParser();
p.parseFromString("<root/>", "application/xml");
// nsConsoleService notifies its listeners via async proxies, so we need
// to wait to see whether there was an error reported.
setTimeout(step2, 0);
} finally {
serv.unregisterListener(listener);
}
]]></script>
</window>