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

Setup carried out margin state for block reflow

Browse Source
This commit is contained in:
kipp%netscape.com 1998-10-06 00:41:16 +00:00
parent e2507df51c
commit d0511d72fc
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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
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) {