corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out Bug 417356, due to pagination reftest failures.

Browse Source
This commit is contained in:
2008-03-14 01:50:13 -07:00
parent 470df164df
commit df25a6140d
18 changed files with 162 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
layout/generic/nsSimplePageSequence.cpp
View File

@@ -198,16 +198,12 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
// now get out margins & edges
if (mPageData->mPrintSettings) {
nsMargin unwriteableTwips;
mPageData->mPrintSettings->GetUnwriteableMarginInTwips(unwriteableTwips);
NS_ASSERTION(unwriteableTwips.left >= 0 && unwriteableTwips.top >= 0 &&
unwriteableTwips.right >= 0 && unwriteableTwips.bottom >= 0,
"Unwriteable twips should be non-negative");
nsMargin marginTwips;
mPageData->mPrintSettings->GetMarginInTwips(marginTwips);
mMargin = aPresContext->TwipsToAppUnits(marginTwips + unwriteableTwips);
mMargin = nsMargin(aPresContext->TwipsToAppUnits(marginTwips.left),
aPresContext->TwipsToAppUnits(marginTwips.top),
aPresContext->TwipsToAppUnits(marginTwips.right),
aPresContext->TwipsToAppUnits(marginTwips.bottom));
PRInt16 printType;
mPageData->mPrintSettings->GetPrintRange(&printType);
mPrintRangeType = printType;
@@ -223,7 +219,10 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
edgeTwips.right = PR_MIN(PR_MAX(edgeTwips.right, 0), inchInTwips);
mPageData->mEdgePaperMargin =
aPresContext->TwipsToAppUnits(edgeTwips + unwriteableTwips);
nsMargin(aPresContext->TwipsToAppUnits(edgeTwips.left),
aPresContext->TwipsToAppUnits(edgeTwips.top),
aPresContext->TwipsToAppUnits(edgeTwips.right),
aPresContext->TwipsToAppUnits(edgeTwips.bottom));
}
// *** Special Override ***