Bug 539060 - Crash [@ do_QueryFrame::operator<nsIPageSequenceFrame> nsIPageSequenceFrame*() ] in print preview , r=roc

--HG--
extra : rebase_source : 246c540277da95dbc670bcfc899dc9f9796f603e
This commit is contained in:
Olli Pettay 2010-01-25 13:15:25 +02:00
Родитель 6a224ad862
Коммит a3680cd8e2
2 изменённых файлов: 17 добавлений и 3 удалений

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

@ -181,8 +181,7 @@ function runTest3() {
return;
}
SimpleTest.finish();
window.close();
setTimeout(runTest4, 0)
}
function compareFormElementPrint(el1, el2, equals) {
@ -202,6 +201,21 @@ function compareFormElementPrint(el1, el2, equals) {
"Comparing print preview didn't succeed [" + el1 + " : " + el2 + "]");
setTimeout(runTest3, 100);
}
// This is a crash test for bug 539060.
function runTest4() {
window.frames[0].document.body.innerHTML =
"<iframe style='display: none;' src='data:text/html,<iframe>'></iframe>";
setTimeout(runTest4end, 500);
}
function runTest4end() {
printpreview();
exitprintpreview();
SimpleTest.finish();
window.close();
}
]]></script>
<table style="border: 1px solid black;" xmlns="http://www.w3.org/1999/xhtml">
<tr><th>Print preview canvas 1</th><th>Print preview canvas 2</th></tr>

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

@ -1893,7 +1893,7 @@ nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO)
// Without a frame, this document can't be displayed; therefore, there is no
// point to reflowing it
if (!frame) {
aPO->mDontPrint = PR_TRUE;
SetPrintPO(aPO, PR_FALSE);
return NS_OK;
}