зеркало из https://github.com/mozilla/gecko-dev.git
Don't start printing when regression test are executed bug 99633 r=rods sr=attinasi
This commit is contained in:
Родитель
2502cf69ae
Коммит
da6f0e24d3
|
@ -2126,7 +2126,7 @@ PRBool
|
||||||
DocumentViewerImpl::DonePrintingPages(PrintObject* aPO)
|
DocumentViewerImpl::DonePrintingPages(PrintObject* aPO)
|
||||||
{
|
{
|
||||||
//NS_ASSERTION(aPO, "Pointer is null!");
|
//NS_ASSERTION(aPO, "Pointer is null!");
|
||||||
PRINT_DEBUG_MSG3("****** In DV::DonePrintingPages PO: %p (%s)\n", aPO, gFrameTypesStr[aPO->mFrameType]);
|
PRINT_DEBUG_MSG3("****** In DV::DonePrintingPages PO: %p (%s)\n", aPO, aPO?gFrameTypesStr[aPO->mFrameType]:"");
|
||||||
|
|
||||||
if (aPO != nsnull) {
|
if (aPO != nsnull) {
|
||||||
aPO->mHasBeenPrinted = PR_TRUE;
|
aPO->mHasBeenPrinted = PR_TRUE;
|
||||||
|
@ -3278,7 +3278,8 @@ DocumentViewerImpl::SetupToPrintContent(nsIWebShell* aParent,
|
||||||
// BeginDocument may pass back a FAILURE code
|
// BeginDocument may pass back a FAILURE code
|
||||||
// i.e. On Windows, if you are printing to a file and hit "Cancel"
|
// i.e. On Windows, if you are printing to a file and hit "Cancel"
|
||||||
// to the "File Name" dialog, this comes back as an error
|
// to the "File Name" dialog, this comes back as an error
|
||||||
nsresult rv = mPrt->mPrintDC->BeginDocument(docTitleStr);
|
// Don't start printing when regression test are executed
|
||||||
|
nsresult rv = mPrt->mFilePointer ? NS_OK: mPrt->mPrintDC->BeginDocument(docTitleStr);
|
||||||
PRINT_DEBUG_MSG1("****************** Begin Document ************************\n");
|
PRINT_DEBUG_MSG1("****************** Begin Document ************************\n");
|
||||||
|
|
||||||
if (docTitleStr != nsnull) {
|
if (docTitleStr != nsnull) {
|
||||||
|
|
|
@ -2126,7 +2126,7 @@ PRBool
|
||||||
DocumentViewerImpl::DonePrintingPages(PrintObject* aPO)
|
DocumentViewerImpl::DonePrintingPages(PrintObject* aPO)
|
||||||
{
|
{
|
||||||
//NS_ASSERTION(aPO, "Pointer is null!");
|
//NS_ASSERTION(aPO, "Pointer is null!");
|
||||||
PRINT_DEBUG_MSG3("****** In DV::DonePrintingPages PO: %p (%s)\n", aPO, gFrameTypesStr[aPO->mFrameType]);
|
PRINT_DEBUG_MSG3("****** In DV::DonePrintingPages PO: %p (%s)\n", aPO, aPO?gFrameTypesStr[aPO->mFrameType]:"");
|
||||||
|
|
||||||
if (aPO != nsnull) {
|
if (aPO != nsnull) {
|
||||||
aPO->mHasBeenPrinted = PR_TRUE;
|
aPO->mHasBeenPrinted = PR_TRUE;
|
||||||
|
@ -3278,7 +3278,8 @@ DocumentViewerImpl::SetupToPrintContent(nsIWebShell* aParent,
|
||||||
// BeginDocument may pass back a FAILURE code
|
// BeginDocument may pass back a FAILURE code
|
||||||
// i.e. On Windows, if you are printing to a file and hit "Cancel"
|
// i.e. On Windows, if you are printing to a file and hit "Cancel"
|
||||||
// to the "File Name" dialog, this comes back as an error
|
// to the "File Name" dialog, this comes back as an error
|
||||||
nsresult rv = mPrt->mPrintDC->BeginDocument(docTitleStr);
|
// Don't start printing when regression test are executed
|
||||||
|
nsresult rv = mPrt->mFilePointer ? NS_OK: mPrt->mPrintDC->BeginDocument(docTitleStr);
|
||||||
PRINT_DEBUG_MSG1("****************** Begin Document ************************\n");
|
PRINT_DEBUG_MSG1("****************** Begin Document ************************\n");
|
||||||
|
|
||||||
if (docTitleStr != nsnull) {
|
if (docTitleStr != nsnull) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче