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

b=91290 fix for printing regression tests r=karnaze sr=waterson

Browse Source
This commit is contained in:
dcone%netscape.com 2001-08-17 22:16:17 +00:00
parent 6c20fd47b1
commit 411063fb97
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/base/src/nsDocumentViewer.cpp
View File

@ -716,6 +716,8 @@ PrintData::~PrintData()
#ifdef DEBUG_PRINTING
fclose(mDebugFD);
#endif
gCurrentlyPrinting = PR_FALSE;
}
void PrintData::OnStartPrinting()
@ -4256,7 +4258,7 @@ nsresult rv;
// the reason we check here is because this method can be called while
// another is still in here (the printing dialog is a good example).
// the only time we can print more than one job at a time is the regression tests
if(gCurrentlyPrinting && (aFile==0)) {
if(gCurrentlyPrinting) {
// Beep at the user, let them know we are not ready to print.
nsCOMPtr<nsISound> soundInterface( do_CreateInstance(kSoundCID, &rv) );
if (NS_SUCCEEDED(rv) && (soundInterface != nsnull)){
@ -4507,7 +4509,7 @@ nsresult rv;
// notified that images must be loaded as a result of the
// InitialReflow...
//
if(!mIsPrinting){
if(!mIsPrinting || (aFile != 0)){
rv = DocumentReadyForPrinting();
#ifdef DEBUG_dcone
printf("PRINT JOB ENDING, OBSERVER WAS NOT CALLED\n");
@ -4543,7 +4545,13 @@ DocumentViewerImpl::GetPrintable(PRBool *aPrintable)
{
NS_ENSURE_ARG_POINTER(aPrintable);
*aPrintable = PR_TRUE;
if(gCurrentlyPrinting==PR_TRUE){
*aPrintable = PR_FALSE;
} else {
*aPrintable = PR_TRUE;
}
return NS_OK;
}

14
layout/base/nsDocumentViewer.cpp
View File

@ -716,6 +716,8 @@ PrintData::~PrintData()
#ifdef DEBUG_PRINTING
fclose(mDebugFD);
#endif
gCurrentlyPrinting = PR_FALSE;
}
void PrintData::OnStartPrinting()
@ -4256,7 +4258,7 @@ nsresult rv;
// the reason we check here is because this method can be called while
// another is still in here (the printing dialog is a good example).
// the only time we can print more than one job at a time is the regression tests
if(gCurrentlyPrinting && (aFile==0)) {
if(gCurrentlyPrinting) {
// Beep at the user, let them know we are not ready to print.
nsCOMPtr<nsISound> soundInterface( do_CreateInstance(kSoundCID, &rv) );
if (NS_SUCCEEDED(rv) && (soundInterface != nsnull)){
@ -4507,7 +4509,7 @@ nsresult rv;
// notified that images must be loaded as a result of the
// InitialReflow...
//
if(!mIsPrinting){
if(!mIsPrinting || (aFile != 0)){
rv = DocumentReadyForPrinting();
#ifdef DEBUG_dcone
printf("PRINT JOB ENDING, OBSERVER WAS NOT CALLED\n");
@ -4543,7 +4545,13 @@ DocumentViewerImpl::GetPrintable(PRBool *aPrintable)
{
NS_ENSURE_ARG_POINTER(aPrintable);
*aPrintable = PR_TRUE;
if(gCurrentlyPrinting==PR_TRUE){
*aPrintable = PR_FALSE;
} else {
*aPrintable = PR_TRUE;
}
return NS_OK;
}