Bug 883514: During block reflow, check floats after reflowing bullet frames, instead of before. r=dbaron
This commit is contained in:
@@ -1046,8 +1046,6 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
|
||||
#endif
|
||||
}
|
||||
|
||||
CheckFloats(state);
|
||||
|
||||
// Place the "marker" (bullet) frame if it is placed next to a block
|
||||
// child.
|
||||
//
|
||||
@@ -1091,6 +1089,8 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
|
||||
// Otherwise just leave the bullet where it is, up against our top padding.
|
||||
}
|
||||
|
||||
CheckFloats(state);
|
||||
|
||||
// Compute our final size
|
||||
nscoord bottomEdgeOfChildren;
|
||||
ComputeFinalSize(*reflowState, state, aMetrics, &bottomEdgeOfChildren);
|
||||
|
||||
Reference in New Issue
Block a user