Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing unwanted part of patch

Browse Source
This commit is contained in:
rods%netscape.com 2002-10-03 11:28:48 +00:00
parent a731676e45
commit c29b4912ff
4 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/base/src/nsPrintEngine.cpp
View File

@ -838,11 +838,10 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings,
// Get the Original PixelScale incase we need to start changing it
mPrt->mPrintDC->GetCanonicalPixelScale(mPrt->mOrigDCScale);
// Shrink to Fit over rides and scaling values
double scaling = 1.0;
mPrt->mPrintSettings->GetScaling(&scaling);
if (!mPrt->mShrinkToFit) {
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
mPrt->mPrintDC->SetCanonicalPixelScale(float(scaling)*mPrt->mOrigDCScale);
mPrt->mShrinkRatio = float(scaling);
}
if(webContainer) {
@ -1230,11 +1229,10 @@ nsPrintEngine::PrintPreview(nsIPrintSettings* aPrintSettings,
mDeviceContext->SetAltDevice(ppDC);
if (mPrt->mPrintSettings != nsnull) {
// Shrink to Fit over rides and scaling values
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
if (!mPrt->mShrinkToFit) {
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
mDeviceContext->SetCanonicalPixelScale(float(scaling)*mPrt->mOrigDCScale);
mPrt->mShrinkRatio = float(scaling);
}
}
ppDC->GetDeviceSurfaceDimensions(width, height);
@ -2576,7 +2574,6 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, PRBool aSetPixelScale, PRBool a
// Here is where we set the shrinkage value into the DC
// and this is what actually makes it shrink
float ratio = mPrt->mShrinkRatio;
if (aSetPixelScale && aPO->mFrameType != eIFrame) {
float ratio;
if (mPrt->mPrintFrameType == nsIPrintSettings::kFramesAsIs || mPrt->mPrintFrameType == nsIPrintSettings::kNoFrames) {
@ -2587,13 +2584,6 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, PRBool aSetPixelScale, PRBool a
mPrt->mPrintDC->SetCanonicalPixelScale(ratio*mPrt->mOrigDCScale);
}
// Set ScaleFactor here so we can use later when the PresContext is created
if (!mPrt->mShrinkToFit || (mPrt->mShrinkToFit && aSetPixelScale)) {
aPO->mScaleFactor = ratio;
} else {
aPO->mScaleFactor = 0.0f;
}
// Reflow the PO
if (NS_FAILED(ReflowPrintObject(aPO, aDoCalcShrink))) {
return NS_ERROR_FAILURE;
@ -2660,10 +2650,6 @@ nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO, PRBool aDoCalcShrink)
printcon->SetPrintSettings(mPrt->mPrintSettings);
}
// Set up scale factor into PresContext
if (aPO->mScaleFactor > 0.0f) {
aPO->mPresContext->SetPrintScale(aPO->mScaleFactor);
}
// set the presentation context to the value in the print settings
PRBool printBGColors;

3
content/base/src/nsPrintEngine.h
View File

@ -259,9 +259,10 @@ public:
nsCOMPtr<nsIViewManager>& aVM,
nsCOMPtr<nsIWidget>& aW);
void SetDialogParent(nsIDOMWindowInternal* aDOMWin) { mDialogParentWin = aDOMWin; }
static nsIPresShell* GetPresShellFor(nsIDocShell* aDocShell);
void SetDialogParent(nsIDOMWindowInternal* aDOMWin) { mDialogParentWin = aDOMWin; }
// These calls also update the DocViewer
void SetIsPrinting(PRBool aIsPrinting) { mIsDoingPrinting = aIsPrinting; }
PRBool GetIsPrinting() { return mIsDoingPrinting; }

22
layout/printing/nsPrintEngine.cpp
View File

@ -838,11 +838,10 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings,
// Get the Original PixelScale incase we need to start changing it
mPrt->mPrintDC->GetCanonicalPixelScale(mPrt->mOrigDCScale);
// Shrink to Fit over rides and scaling values
double scaling = 1.0;
mPrt->mPrintSettings->GetScaling(&scaling);
if (!mPrt->mShrinkToFit) {
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
mPrt->mPrintDC->SetCanonicalPixelScale(float(scaling)*mPrt->mOrigDCScale);
mPrt->mShrinkRatio = float(scaling);
}
if(webContainer) {
@ -1230,11 +1229,10 @@ nsPrintEngine::PrintPreview(nsIPrintSettings* aPrintSettings,
mDeviceContext->SetAltDevice(ppDC);
if (mPrt->mPrintSettings != nsnull) {
// Shrink to Fit over rides and scaling values
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
if (!mPrt->mShrinkToFit) {
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
mDeviceContext->SetCanonicalPixelScale(float(scaling)*mPrt->mOrigDCScale);
mPrt->mShrinkRatio = float(scaling);
}
}
ppDC->GetDeviceSurfaceDimensions(width, height);
@ -2576,7 +2574,6 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, PRBool aSetPixelScale, PRBool a
// Here is where we set the shrinkage value into the DC
// and this is what actually makes it shrink
float ratio = mPrt->mShrinkRatio;
if (aSetPixelScale && aPO->mFrameType != eIFrame) {
float ratio;
if (mPrt->mPrintFrameType == nsIPrintSettings::kFramesAsIs || mPrt->mPrintFrameType == nsIPrintSettings::kNoFrames) {
@ -2587,13 +2584,6 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, PRBool aSetPixelScale, PRBool a
mPrt->mPrintDC->SetCanonicalPixelScale(ratio*mPrt->mOrigDCScale);
}
// Set ScaleFactor here so we can use later when the PresContext is created
if (!mPrt->mShrinkToFit || (mPrt->mShrinkToFit && aSetPixelScale)) {
aPO->mScaleFactor = ratio;
} else {
aPO->mScaleFactor = 0.0f;
}
// Reflow the PO
if (NS_FAILED(ReflowPrintObject(aPO, aDoCalcShrink))) {
return NS_ERROR_FAILURE;
@ -2660,10 +2650,6 @@ nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO, PRBool aDoCalcShrink)
printcon->SetPrintSettings(mPrt->mPrintSettings);
}
// Set up scale factor into PresContext
if (aPO->mScaleFactor > 0.0f) {
aPO->mPresContext->SetPrintScale(aPO->mScaleFactor);
}
// set the presentation context to the value in the print settings
PRBool printBGColors;

3
layout/printing/nsPrintEngine.h
View File

@ -259,9 +259,10 @@ public:
nsCOMPtr<nsIViewManager>& aVM,
nsCOMPtr<nsIWidget>& aW);
void SetDialogParent(nsIDOMWindowInternal* aDOMWin) { mDialogParentWin = aDOMWin; }
static nsIPresShell* GetPresShellFor(nsIDocShell* aDocShell);
void SetDialogParent(nsIDOMWindowInternal* aDOMWin) { mDialogParentWin = aDOMWin; }
// These calls also update the DocViewer
void SetIsPrinting(PRBool aIsPrinting) { mIsDoingPrinting = aIsPrinting; }
PRBool GetIsPrinting() { return mIsDoingPrinting; }