Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We were sending Progress notification from the destructor of the PrintData.

Browse Source 
I have done the following:
1) Removed unneeded nsresult arg from OnEndPrinting
2) Removed unneeded calls to OnEndPrinting before the deletion of PrintData objs
3) The destructor of PrintData now only calls OnEndPrinting if onStartPrinting  was called first, meaning printing notification was actually started.
Bug 126427 r=dcone sr=attinasi a=roc


git-svn-id: svn://10.0.0.236/trunk@115150 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com 2002-02-21 13:23:11 +00:00
parent f7e9f57834
commit 46c42a9045
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/content/base/src/nsDocumentViewer.cpp
View File

@ -365,7 +365,7 @@ public:
~PrintData(); // non-virtual
// Listener Helper Methods
void OnEndPrinting(nsresult aResult);
void OnEndPrinting();
void OnStartPrinting();
static void DoOnProgressChange(nsVoidArray& aListeners,
PRInt32 aProgess,
@ -804,10 +804,10 @@ PrintData::PrintData() :
PrintData::~PrintData()
{
// printing is complete, clean up now
OnEndPrinting(NS_OK); // removes listener
// Only Send an OnEndPrinting if we have started printing
if (mOnStartSent) {
OnEndPrinting();
}
if (mPrintDC && !mDebugFilePtr) {
#ifdef DEBUG_PRINTING
@ -856,11 +856,8 @@ void PrintData::OnStartPrinting()
}
}
void PrintData::OnEndPrinting(nsresult aResult)
void PrintData::OnEndPrinting()
{
// Make sure OnStartPrinting was called
OnStartPrinting();
DoOnProgressChange(mPrintProgressListeners, 100, 100, PR_TRUE, nsIWebProgressListener::STATE_STOP|nsIWebProgressListener::STATE_IS_DOCUMENT);
if (mPrintProgress && mShowProgressDialog) {
mPrintProgress->CloseProgressDialog(PR_TRUE);
@ -1419,7 +1416,6 @@ DocumentViewerImpl::Destroy()
// used from JS.
if (mPrt) {
mPrt->OnEndPrinting(NS_ERROR_FAILURE);
delete mPrt;
mPrt = nsnull;
}
@ -5705,7 +5701,6 @@ DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings)
/* cleaup on failure + notify user */
if (NS_FAILED(rv)) {
if (mPrt) {
mPrt->OnEndPrinting(rv);
delete mPrt;
mPrt = nsnull;
}
@ -6199,7 +6194,6 @@ DocumentViewerImpl::Print(nsIPrintSettings* aPrintSettings,
}
if (mPrt) {
mPrt->OnEndPrinting(rv);
delete mPrt;
mPrt = nsnull;
}

18
mozilla/layout/base/nsDocumentViewer.cpp
View File

@ -365,7 +365,7 @@ public:
~PrintData(); // non-virtual
// Listener Helper Methods
void OnEndPrinting(nsresult aResult);
void OnEndPrinting();
void OnStartPrinting();
static void DoOnProgressChange(nsVoidArray& aListeners,
PRInt32 aProgess,
@ -804,10 +804,10 @@ PrintData::PrintData() :
PrintData::~PrintData()
{
// printing is complete, clean up now
OnEndPrinting(NS_OK); // removes listener
// Only Send an OnEndPrinting if we have started printing
if (mOnStartSent) {
OnEndPrinting();
}
if (mPrintDC && !mDebugFilePtr) {
#ifdef DEBUG_PRINTING
@ -856,11 +856,8 @@ void PrintData::OnStartPrinting()
}
}
void PrintData::OnEndPrinting(nsresult aResult)
void PrintData::OnEndPrinting()
{
// Make sure OnStartPrinting was called
OnStartPrinting();
DoOnProgressChange(mPrintProgressListeners, 100, 100, PR_TRUE, nsIWebProgressListener::STATE_STOP|nsIWebProgressListener::STATE_IS_DOCUMENT);
if (mPrintProgress && mShowProgressDialog) {
mPrintProgress->CloseProgressDialog(PR_TRUE);
@ -1419,7 +1416,6 @@ DocumentViewerImpl::Destroy()
// used from JS.
if (mPrt) {
mPrt->OnEndPrinting(NS_ERROR_FAILURE);
delete mPrt;
mPrt = nsnull;
}
@ -5705,7 +5701,6 @@ DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings)
/* cleaup on failure + notify user */
if (NS_FAILED(rv)) {
if (mPrt) {
mPrt->OnEndPrinting(rv);
delete mPrt;
mPrt = nsnull;
}
@ -6199,7 +6194,6 @@ DocumentViewerImpl::Print(nsIPrintSettings* aPrintSettings,
}
if (mPrt) {
mPrt->OnEndPrinting(rv);
delete mPrt;
mPrt = nsnull;
}