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

Setup carried out margin state for block reflow

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11989 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1998-10-06 00:41:16 +00:00
parent 439be2dde9
commit a363dc37c3
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/layout/generic/nsInlineFrame.cpp
View File

@ -536,10 +536,17 @@ nsInlineFrame::ComputeFinalSize(nsInlineReflowState& aState,
if (aState.mIsMarginRoot) {
aMetrics.mCarriedOutTopMargin = 0;
aMetrics.mCarriedOutBottomMargin = 0;
aMetrics.mCarriedOutMarginFlags = 0;
}
else {
aMetrics.mCarriedOutTopMargin = aState.mCollapsedTopMargin;
aMetrics.mCarriedOutBottomMargin = aState.mPrevBottomMargin;
if (aInlineReflow.GetIsBlock()) {
aMetrics.mCarriedOutMarginFlags = aInlineReflow.GetMarginFlags();
}
else {
aMetrics.mCarriedOutMarginFlags = 0;
}
}
if (aState.mComputeMaxElementSize) {

7
mozilla/layout/html/base/src/nsInlineFrame.cpp
View File

@ -536,10 +536,17 @@ nsInlineFrame::ComputeFinalSize(nsInlineReflowState& aState,
if (aState.mIsMarginRoot) {
aMetrics.mCarriedOutTopMargin = 0;
aMetrics.mCarriedOutBottomMargin = 0;
aMetrics.mCarriedOutMarginFlags = 0;
}
else {
aMetrics.mCarriedOutTopMargin = aState.mCollapsedTopMargin;
aMetrics.mCarriedOutBottomMargin = aState.mPrevBottomMargin;
if (aInlineReflow.GetIsBlock()) {
aMetrics.mCarriedOutMarginFlags = aInlineReflow.GetMarginFlags();
}
else {
aMetrics.mCarriedOutMarginFlags = 0;
}
}
if (aState.mComputeMaxElementSize) {