diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index 5f3855a7c5f..7948ee2c54d 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -181,7 +181,6 @@ protected: nsIPresShell *mPrintPS; nsIViewManager *mPrintVM; nsIView *mPrintView; - nsIImageGroup *mImageGroup; }; @@ -547,10 +546,15 @@ PRBool isBusy; nsComponentManager::CreateInstance(kDeviceContextSpecFactoryCID, nsnull,kIDeviceContextSpecFactoryIID,(void **)&factory); if (nsnull != factory) { + +#ifdef DEBUG_dcone + printf("PRINT JOB STARTING\n"); +#endif + nsIDeviceContextSpec *devspec = nsnull; nsCOMPtr dx; - //nsIDeviceContext *newdx = nsnull; mPrintDC = nsnull; + factory->CreateDeviceContextSpec(nsnull, devspec, PR_FALSE); if (nsnull != devspec) { mPresContext->GetDeviceContext(getter_AddRefs(dx)); @@ -607,6 +611,55 @@ PRBool isBusy; mPrintPS->Init(mDocument,mPrintPC,mPrintVM,mPrintSS); mPrintPS->InitialReflow(width,height); +#ifdef DEBUG_dcone + float a1,a2; + PRInt32 i1,i2; + + printf("CRITICAL PRINTING INFORMATION\n"); + printf("PRESSHELL(%x) PRESCONTEXT(%x)\nVIEWMANAGER(%x) VIEW(%x)\n", + mPrintPS, mPrintPC,mPrintDC,mPrintVM,mPrintView); + + // DEVICE CONTEXT INFORMATION from PresContext + printf("DeviceContext of Presentation Context(%x)\n",dx); + dx->GetDevUnitsToTwips(a1); + dx->GetTwipsToDevUnits(a2); + printf(" DevToTwips = %f TwipToDev = %f\n",a1,a2); + dx->GetAppUnitsToDevUnits(a1); + dx->GetDevUnitsToAppUnits(a2); + printf(" AppUnitsToDev = %f DevUnitsToApp = %f\n",a1,a2); + dx->GetCanonicalPixelScale(a1); + printf(" GetCanonicalPixelScale = %f\n",a1); + dx->GetScrollBarDimensions(a1, a2); + printf(" ScrollBar x = %f y = %f\n",a1,a2); + dx->GetZoom(a1); + printf(" Zoom = %f\n",a1); + dx->GetDepth((PRUint32&)i1); + printf(" Depth = %d\n",i1); + dx->GetDeviceSurfaceDimensions(i1,i2); + printf(" DeviceDimension w = %d h = %d\n",i1,i2); + + + // DEVICE CONTEXT INFORMATION + printf("DeviceContext created for print(%x)\n",mPrintDC); + mPrintDC->GetDevUnitsToTwips(a1); + mPrintDC->GetTwipsToDevUnits(a2); + printf(" DevToTwips = %f TwipToDev = %f\n",a1,a2); + mPrintDC->GetAppUnitsToDevUnits(a1); + mPrintDC->GetDevUnitsToAppUnits(a2); + printf(" AppUnitsToDev = %f DevUnitsToApp = %f\n",a1,a2); + mPrintDC->GetCanonicalPixelScale(a1); + printf(" GetCanonicalPixelScale = %f\n",a1); + mPrintDC->GetScrollBarDimensions(a1, a2); + printf(" ScrollBar x = %f y = %f\n",a1,a2); + mPrintDC->GetZoom(a1); + printf(" Zoom = %f\n",a1); + mPrintDC->GetDepth((PRUint32&)i1); + printf(" Depth = %d\n",i1); + mPrintDC->GetDeviceSurfaceDimensions(i1,i2); + printf(" DeviceDimension w = %d h = %d\n",i1,i2); + +#endif + // check NETLIB to see if something was kicked off, webContainer->IsBusy(isBusy); @@ -619,8 +672,14 @@ PRBool isBusy; NS_RELEASE(mPrintVM); NS_RELEASE(mPrintSS); NS_RELEASE(mPrintDC); +#ifdef DEBUG_dcone + printf("PRINT JOB ENDING, OBSERVER WAS NOT CALLED\n"); +#endif } else { // use the observer mechanism to finish the printing +#ifdef DEBUG_dcone + printf("PRINTING OBSERVER STARTED\n"); +#endif mIsPrinting = PR_TRUE; mNumURLStarts = 0; } diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 5f3855a7c5f..7948ee2c54d 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -181,7 +181,6 @@ protected: nsIPresShell *mPrintPS; nsIViewManager *mPrintVM; nsIView *mPrintView; - nsIImageGroup *mImageGroup; }; @@ -547,10 +546,15 @@ PRBool isBusy; nsComponentManager::CreateInstance(kDeviceContextSpecFactoryCID, nsnull,kIDeviceContextSpecFactoryIID,(void **)&factory); if (nsnull != factory) { + +#ifdef DEBUG_dcone + printf("PRINT JOB STARTING\n"); +#endif + nsIDeviceContextSpec *devspec = nsnull; nsCOMPtr dx; - //nsIDeviceContext *newdx = nsnull; mPrintDC = nsnull; + factory->CreateDeviceContextSpec(nsnull, devspec, PR_FALSE); if (nsnull != devspec) { mPresContext->GetDeviceContext(getter_AddRefs(dx)); @@ -607,6 +611,55 @@ PRBool isBusy; mPrintPS->Init(mDocument,mPrintPC,mPrintVM,mPrintSS); mPrintPS->InitialReflow(width,height); +#ifdef DEBUG_dcone + float a1,a2; + PRInt32 i1,i2; + + printf("CRITICAL PRINTING INFORMATION\n"); + printf("PRESSHELL(%x) PRESCONTEXT(%x)\nVIEWMANAGER(%x) VIEW(%x)\n", + mPrintPS, mPrintPC,mPrintDC,mPrintVM,mPrintView); + + // DEVICE CONTEXT INFORMATION from PresContext + printf("DeviceContext of Presentation Context(%x)\n",dx); + dx->GetDevUnitsToTwips(a1); + dx->GetTwipsToDevUnits(a2); + printf(" DevToTwips = %f TwipToDev = %f\n",a1,a2); + dx->GetAppUnitsToDevUnits(a1); + dx->GetDevUnitsToAppUnits(a2); + printf(" AppUnitsToDev = %f DevUnitsToApp = %f\n",a1,a2); + dx->GetCanonicalPixelScale(a1); + printf(" GetCanonicalPixelScale = %f\n",a1); + dx->GetScrollBarDimensions(a1, a2); + printf(" ScrollBar x = %f y = %f\n",a1,a2); + dx->GetZoom(a1); + printf(" Zoom = %f\n",a1); + dx->GetDepth((PRUint32&)i1); + printf(" Depth = %d\n",i1); + dx->GetDeviceSurfaceDimensions(i1,i2); + printf(" DeviceDimension w = %d h = %d\n",i1,i2); + + + // DEVICE CONTEXT INFORMATION + printf("DeviceContext created for print(%x)\n",mPrintDC); + mPrintDC->GetDevUnitsToTwips(a1); + mPrintDC->GetTwipsToDevUnits(a2); + printf(" DevToTwips = %f TwipToDev = %f\n",a1,a2); + mPrintDC->GetAppUnitsToDevUnits(a1); + mPrintDC->GetDevUnitsToAppUnits(a2); + printf(" AppUnitsToDev = %f DevUnitsToApp = %f\n",a1,a2); + mPrintDC->GetCanonicalPixelScale(a1); + printf(" GetCanonicalPixelScale = %f\n",a1); + mPrintDC->GetScrollBarDimensions(a1, a2); + printf(" ScrollBar x = %f y = %f\n",a1,a2); + mPrintDC->GetZoom(a1); + printf(" Zoom = %f\n",a1); + mPrintDC->GetDepth((PRUint32&)i1); + printf(" Depth = %d\n",i1); + mPrintDC->GetDeviceSurfaceDimensions(i1,i2); + printf(" DeviceDimension w = %d h = %d\n",i1,i2); + +#endif + // check NETLIB to see if something was kicked off, webContainer->IsBusy(isBusy); @@ -619,8 +672,14 @@ PRBool isBusy; NS_RELEASE(mPrintVM); NS_RELEASE(mPrintSS); NS_RELEASE(mPrintDC); +#ifdef DEBUG_dcone + printf("PRINT JOB ENDING, OBSERVER WAS NOT CALLED\n"); +#endif } else { // use the observer mechanism to finish the printing +#ifdef DEBUG_dcone + printf("PRINTING OBSERVER STARTED\n"); +#endif mIsPrinting = PR_TRUE; mNumURLStarts = 0; } diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp index 5f3855a7c5f..7948ee2c54d 100644 --- a/mozilla/layout/base/src/nsDocumentViewer.cpp +++ b/mozilla/layout/base/src/nsDocumentViewer.cpp @@ -181,7 +181,6 @@ protected: nsIPresShell *mPrintPS; nsIViewManager *mPrintVM; nsIView *mPrintView; - nsIImageGroup *mImageGroup; }; @@ -547,10 +546,15 @@ PRBool isBusy; nsComponentManager::CreateInstance(kDeviceContextSpecFactoryCID, nsnull,kIDeviceContextSpecFactoryIID,(void **)&factory); if (nsnull != factory) { + +#ifdef DEBUG_dcone + printf("PRINT JOB STARTING\n"); +#endif + nsIDeviceContextSpec *devspec = nsnull; nsCOMPtr dx; - //nsIDeviceContext *newdx = nsnull; mPrintDC = nsnull; + factory->CreateDeviceContextSpec(nsnull, devspec, PR_FALSE); if (nsnull != devspec) { mPresContext->GetDeviceContext(getter_AddRefs(dx)); @@ -607,6 +611,55 @@ PRBool isBusy; mPrintPS->Init(mDocument,mPrintPC,mPrintVM,mPrintSS); mPrintPS->InitialReflow(width,height); +#ifdef DEBUG_dcone + float a1,a2; + PRInt32 i1,i2; + + printf("CRITICAL PRINTING INFORMATION\n"); + printf("PRESSHELL(%x) PRESCONTEXT(%x)\nVIEWMANAGER(%x) VIEW(%x)\n", + mPrintPS, mPrintPC,mPrintDC,mPrintVM,mPrintView); + + // DEVICE CONTEXT INFORMATION from PresContext + printf("DeviceContext of Presentation Context(%x)\n",dx); + dx->GetDevUnitsToTwips(a1); + dx->GetTwipsToDevUnits(a2); + printf(" DevToTwips = %f TwipToDev = %f\n",a1,a2); + dx->GetAppUnitsToDevUnits(a1); + dx->GetDevUnitsToAppUnits(a2); + printf(" AppUnitsToDev = %f DevUnitsToApp = %f\n",a1,a2); + dx->GetCanonicalPixelScale(a1); + printf(" GetCanonicalPixelScale = %f\n",a1); + dx->GetScrollBarDimensions(a1, a2); + printf(" ScrollBar x = %f y = %f\n",a1,a2); + dx->GetZoom(a1); + printf(" Zoom = %f\n",a1); + dx->GetDepth((PRUint32&)i1); + printf(" Depth = %d\n",i1); + dx->GetDeviceSurfaceDimensions(i1,i2); + printf(" DeviceDimension w = %d h = %d\n",i1,i2); + + + // DEVICE CONTEXT INFORMATION + printf("DeviceContext created for print(%x)\n",mPrintDC); + mPrintDC->GetDevUnitsToTwips(a1); + mPrintDC->GetTwipsToDevUnits(a2); + printf(" DevToTwips = %f TwipToDev = %f\n",a1,a2); + mPrintDC->GetAppUnitsToDevUnits(a1); + mPrintDC->GetDevUnitsToAppUnits(a2); + printf(" AppUnitsToDev = %f DevUnitsToApp = %f\n",a1,a2); + mPrintDC->GetCanonicalPixelScale(a1); + printf(" GetCanonicalPixelScale = %f\n",a1); + mPrintDC->GetScrollBarDimensions(a1, a2); + printf(" ScrollBar x = %f y = %f\n",a1,a2); + mPrintDC->GetZoom(a1); + printf(" Zoom = %f\n",a1); + mPrintDC->GetDepth((PRUint32&)i1); + printf(" Depth = %d\n",i1); + mPrintDC->GetDeviceSurfaceDimensions(i1,i2); + printf(" DeviceDimension w = %d h = %d\n",i1,i2); + +#endif + // check NETLIB to see if something was kicked off, webContainer->IsBusy(isBusy); @@ -619,8 +672,14 @@ PRBool isBusy; NS_RELEASE(mPrintVM); NS_RELEASE(mPrintSS); NS_RELEASE(mPrintDC); +#ifdef DEBUG_dcone + printf("PRINT JOB ENDING, OBSERVER WAS NOT CALLED\n"); +#endif } else { // use the observer mechanism to finish the printing +#ifdef DEBUG_dcone + printf("PRINTING OBSERVER STARTED\n"); +#endif mIsPrinting = PR_TRUE; mNumURLStarts = 0; }