зеркало из https://github.com/mozilla/pjs.git
Bug 396024 � Crash [@ nsPrintEngine::DocumentReadyForPrinting] with testcase that set print preview, then reloads the page, part 2, r=sharparrow1, sr=roc, blocking1.9+
This commit is contained in:
martijn.martijn%gmail.com
Родитель
1ff72f9922
Коммит
ffe88ed1b3
|
|
@ -1411,6 +1411,23 @@ DocumentViewerImpl::Destroy()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef NS_PRINTING
|
||||||
|
if (mPrintEngine) {
|
||||||
|
// This code was moved earlier to fix a crash when a document was
|
||||||
|
// destroyed while it was in print preview mode, see bug 396024
|
||||||
|
#ifdef NS_PRINT_PREVIEW
|
||||||
|
PRBool doingPrintPreview;
|
||||||
|
mPrintEngine->GetDoingPrintPreview(&doingPrintPreview);
|
||||||
|
if (doingPrintPreview) {
|
||||||
|
mPrintEngine->FinishPrintPreview();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
mPrintEngine->Destroy();
|
||||||
|
mPrintEngine = nsnull;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
Hide();
|
Hide();
|
||||||
|
|
||||||
// This is after Hide() so that the user doesn't see the inputs clear.
|
// This is after Hide() so that the user doesn't see the inputs clear.
|
||||||
|
|
@ -1470,21 +1487,6 @@ DocumentViewerImpl::Destroy()
|
||||||
// destructor might never be called (especially if we're being
|
// destructor might never be called (especially if we're being
|
||||||
// used from JS.
|
// used from JS.
|
||||||
|
|
||||||
#ifdef NS_PRINTING
|
|
||||||
if (mPrintEngine) {
|
|
||||||
#ifdef NS_PRINT_PREVIEW
|
|
||||||
PRBool doingPrintPreview;
|
|
||||||
mPrintEngine->GetDoingPrintPreview(&doingPrintPreview);
|
|
||||||
if (doingPrintPreview) {
|
|
||||||
mPrintEngine->FinishPrintPreview();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
mPrintEngine->Destroy();
|
|
||||||
mPrintEngine = nsnull;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Avoid leaking the old viewer.
|
// Avoid leaking the old viewer.
|
||||||
if (mPreviousViewer) {
|
if (mPreviousViewer) {
|
||||||
mPreviousViewer->Destroy();
|
mPreviousViewer->Destroy();
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,7 @@ ifdef MOZ_MOCHITEST
|
||||||
_TEST_FILES = \
|
_TEST_FILES = \
|
||||||
test_bug66619.html \
|
test_bug66619.html \
|
||||||
test_bug388019.html \
|
test_bug388019.html \
|
||||||
|
test_bug396024.html \
|
||||||
test_bug399284.html \
|
test_bug399284.html \
|
||||||
test_bug399951.html \
|
test_bug399951.html \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,91 @@
|
||||||
|
<html>
|
||||||
|
<!--
|
||||||
|
https://bugzilla.mozilla.org/show_bug.cgi?id=396024
|
||||||
|
-->
|
||||||
|
<head>
|
||||||
|
<title>Test for Bug 396024</title>
|
||||||
|
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
|
||||||
|
<script type="text/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=396024">Mozilla Bug 396024</a>
|
||||||
|
|
||||||
|
<pre id="test">
|
||||||
|
<script class="testbody" type="text/javascript">
|
||||||
|
var gWbp;
|
||||||
|
function printpreview() {
|
||||||
|
netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesRead UniversalPreferencesWrite UniversalXPConnect');
|
||||||
|
|
||||||
|
gWbp = window.frames[0].QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
|
.getInterface(Components.interfaces.nsIWebBrowserPrint);
|
||||||
|
var listener = {
|
||||||
|
onLocationChange: function(webProgress, request, location) { },
|
||||||
|
onProgressChange: function(webProgress, request, curSelfProgress,
|
||||||
|
maxSelfProgress, curTotalProgress,
|
||||||
|
maxTotalProgress) { },
|
||||||
|
onSecurityChange: function(webProgress, request, state) { },
|
||||||
|
onStateChange: function(webProgress, request, stateFlags, status) { },
|
||||||
|
onStatusChange: function(webProgress, request, status, message) { },
|
||||||
|
QueryInterface: function(iid) {
|
||||||
|
if (iid.equals(Components.interfaces.nsIWebProgessListener) ||
|
||||||
|
iid.equals(Components.interfaces.nsISupportsWeakReference))
|
||||||
|
return this;
|
||||||
|
throw Components.results.NS_NOINTERFACE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
.getService(Components.interfaces.nsIPrefBranch);
|
||||||
|
prefs.setBoolPref('print.show_print_progress', false);
|
||||||
|
//XXX I would have thought this would work, instead I'm forced to use prefs service
|
||||||
|
// I'm disabling showPrintProgress dialog, because it stays as a zombie dialog, see bug 405588
|
||||||
|
gWbp.globalPrintSettings.showPrintProgress = false;
|
||||||
|
gWbp.printPreview(gWbp.globalPrintSettings, null, listener);
|
||||||
|
prefs.clearUserPref('print.show_print_progress');
|
||||||
|
}
|
||||||
|
|
||||||
|
function exitprintpreview() {
|
||||||
|
netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesRead UniversalPreferencesWrite UniversalXPConnect');
|
||||||
|
window.frames[0].QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
|
.getInterface(Components.interfaces.nsIWebBrowserPrint).exitPrintPreview();
|
||||||
|
}
|
||||||
|
|
||||||
|
function run()
|
||||||
|
{
|
||||||
|
/** Test for Bug 396024 **/
|
||||||
|
window.frames[0].frameElement.setAttribute('onload', 'run2()');
|
||||||
|
netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesRead UniversalPreferencesWrite UniversalXPConnect');
|
||||||
|
SimpleTest.waitForExplicitFinish();
|
||||||
|
printpreview();
|
||||||
|
ok(gWbp.doingPrintPreview, "Should be doing print preview");
|
||||||
|
exitprintpreview();
|
||||||
|
ok(!gWbp.doingPrintPreview, "Should not be doing print preview anymore1");
|
||||||
|
printpreview();
|
||||||
|
window.frames[0].location.reload();
|
||||||
|
}
|
||||||
|
|
||||||
|
function run2() {
|
||||||
|
netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesRead UniversalPreferencesWrite UniversalXPConnect');
|
||||||
|
gWbp = window.frames[0].QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
|
.getInterface(Components.interfaces.nsIWebBrowserPrint);
|
||||||
|
ok(!gWbp.doingPrintPreview, "Should not be doing print preview anymore2");
|
||||||
|
window.frames[0].frameElement.removeAttribute('onload');
|
||||||
|
printpreview();
|
||||||
|
var x = window.frames[0].frameElement.parentNode.removeChild(window.frames[0].frameElement);
|
||||||
|
document.body.offsetHeight;
|
||||||
|
document.body.appendChild(x);
|
||||||
|
gWbp = window.frames[0].QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
|
.getInterface(Components.interfaces.nsIWebBrowserPrint);
|
||||||
|
ok(!gWbp.doingPrintPreview, "Should not be doing print preview anymore3");
|
||||||
|
|
||||||
|
//XXX this shouldn't be necessary, see bug 405555
|
||||||
|
printpreview();
|
||||||
|
exitprintpreview();
|
||||||
|
SimpleTest.finish(); //should not have crashed after all of this
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<iframe onload="run()" src="data:text/html;charset=utf-8,"></iframe>
|
||||||
|
</pre>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
Загрузка…
Ссылка в новой задаче