Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't resolve the positive and negative parts of collapsing margins too early when collapsing through empty blocks. A few bits of other cleanup. b=172892 sr=bzbarsky r=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@131355 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2002-10-08 01:52:34 +00:00
parent 1277a10e5e
commit cd7f730327
10 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/generic/nsBlockReflowContext.cpp
View File

@@ -409,7 +409,7 @@ nsBlockReflowContext::ReflowBlock(const nsRect& aSpace,
aFrameRS.availableHeight -= aPrevBottomMargin.get();
}
}
mTopMargin = aPrevBottomMargin.get();
mTopMargin = aPrevBottomMargin;
// Compute x/y coordinate where reflow will begin. Use the rules
// from 10.3.3 to determine what to apply. At this point in the
@@ -419,7 +419,7 @@ nsBlockReflowContext::ReflowBlock(const nsRect& aSpace,
mStyleMargin = aFrameRS.mStyleMargin;
mStylePadding = aFrameRS.mStylePadding;
nscoord x;
nscoord y = mSpace.y + mTopMargin;
nscoord y = mSpace.y + mTopMargin.get();
// If it's a right floated element, then calculate the x-offset
// differently
@@ -687,13 +687,12 @@ nsBlockReflowContext::PlaceBlock(const nsHTMLReflowState& aReflowState,
y = mSpace.y;
// Empty blocks do not have anything special done to them and they
// always fit. Note: don't force the width to 0
nsRect r(x, y, mMetrics.width, 0);
// Now place the frame and complete the reflow process
nsContainerFrame::FinishReflowChild(mFrame, mPresContext, &aReflowState, mMetrics, x, y, 0);
aInFlowBounds = r;
// Empty blocks do not have anything special done to them and they
// always fit. Note: don't force the width to 0
aInFlowBounds = nsRect(x, y, mMetrics.width, 0);
// Retain combined area information in case we contain a floater
// and nothing else.
@@ -773,7 +772,7 @@ nsBlockReflowContext::PlaceBlock(const nsHTMLReflowState& aReflowState,
// auto top/bottom margins are always zero)
// XXXldb Should it?
m->height += mTopMargin + mBottomMargin;
m->height += mTopMargin.get() + mBottomMargin;
#endif
}
}