Bug 1425641, part 2 - Remove nsPrintJob::mOldPrtPreview. r=bobowen

MozReview-Commit-ID: Bu4SheVyDGD

--HG--
extra : rebase_source : 01fb811441d3703b992a1a9c2e21431e0491fd76
This commit is contained in:
Jonathan Watt 2017-12-06 10:49:22 +00:00
Родитель 46335998ec
Коммит 1d609cb1b5
2 изменённых файлов: 0 добавлений и 12 удалений

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

@ -230,7 +230,6 @@ nsPrintJob::Destroy()
#ifdef NS_PRINT_PREVIEW
mPrtPreview = nullptr;
mOldPrtPreview = nullptr;
#endif
mDocViewerPrint = nullptr;
}
@ -418,10 +417,6 @@ nsPrintJob::DoCommonPrint(bool aIsPrintPreview,
// then that means the progress dialog is already being shown.
nsCOMPtr<nsIPrintingPromptService> pps(do_QueryInterface(aWebProgressListener));
mProgressDialogIsShown = pps != nullptr;
if (mIsDoingPrintPreview) {
mOldPrtPreview = Move(mPrtPreview);
}
} else {
mProgressDialogIsShown = false;
}
@ -3457,10 +3452,6 @@ nsPrintJob::FinishPrintPreview()
// At this point we are done preparing everything
// before it is to be created
if (mIsDoingPrintPreview && mOldPrtPreview) {
mOldPrtPreview = nullptr;
}
printData->OnEndPrinting();
// XXX If mPrt becomes nullptr or different instance here, what should we
// do?

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

@ -257,10 +257,7 @@ private:
// could conceivably destroy this nsPrintJob owner object and all its
// member-data.
RefPtr<nsPrintData> mPrt;
// Print Preview
RefPtr<nsPrintData> mPrtPreview;
RefPtr<nsPrintData> mOldPrtPreview;
nsPagePrintTimer* mPagePrintTimer = nullptr;