mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-08 12:22:34 +00:00
Fixed margin collapsing bug
This commit is contained in:
parent
6524847ab5
commit
ac0565a8f8
@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
|
||||
// Compute the collapsed top margin value (this is a generational
|
||||
// margin collapse not a sibling margin collapse).
|
||||
nscoord collapsedTopMargin =
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
|
||||
|
||||
// Now perform sibling to sibling margin collapsing.
|
||||
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,
|
||||
|
@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
|
||||
// Compute the collapsed top margin value (this is a generational
|
||||
// margin collapse not a sibling margin collapse).
|
||||
nscoord collapsedTopMargin =
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
|
||||
|
||||
// Now perform sibling to sibling margin collapsing.
|
||||
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,
|
||||
|
@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
|
||||
// Compute the collapsed top margin value (this is a generational
|
||||
// margin collapse not a sibling margin collapse).
|
||||
nscoord collapsedTopMargin =
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
|
||||
|
||||
// Now perform sibling to sibling margin collapsing.
|
||||
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,
|
||||
|
@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
|
||||
// Compute the collapsed top margin value (this is a generational
|
||||
// margin collapse not a sibling margin collapse).
|
||||
nscoord collapsedTopMargin =
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
|
||||
|
||||
// Now perform sibling to sibling margin collapsing.
|
||||
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,
|
||||
|
@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
|
||||
// Compute the collapsed top margin value (this is a generational
|
||||
// margin collapse not a sibling margin collapse).
|
||||
nscoord collapsedTopMargin =
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
|
||||
|
||||
// Now perform sibling to sibling margin collapsing.
|
||||
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,
|
||||
|
@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
|
||||
// Compute the collapsed top margin value (this is a generational
|
||||
// margin collapse not a sibling margin collapse).
|
||||
nscoord collapsedTopMargin =
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
|
||||
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
|
||||
|
||||
// Now perform sibling to sibling margin collapsing.
|
||||
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,
|
||||
|
Loading…
Reference in New Issue
Block a user