Reimplement TrimTrailingWhiteSpace

This commit is contained in:
kipp%netscape.com 1999-09-21 00:13:50 +00:00
parent 94a86fe442
commit b4262f0657
6 changed files with 18 additions and 6 deletions

View File

@ -3642,6 +3642,9 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
{
nsresult rv = NS_OK;
// Trim extra white-space from the line before placing the frames
aLineLayout.TrimTrailingWhiteSpace();
// Vertically align the frames on this line.
//
// According to the CSS2 spec, section 12.6.1, the "marker" box
@ -3695,7 +3698,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
#else
PRBool allowJustify = PR_FALSE;
#endif
aLineLayout.TrimTrailingWhiteSpace(aLine->mBounds);
aLineLayout.HorizontalAlignFrames(aLine->mBounds, allowJustify);
aLineLayout.RelativePositionFrames(aLine->mCombinedArea);
if (addedBullet) {

View File

@ -3642,6 +3642,9 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
{
nsresult rv = NS_OK;
// Trim extra white-space from the line before placing the frames
aLineLayout.TrimTrailingWhiteSpace();
// Vertically align the frames on this line.
//
// According to the CSS2 spec, section 12.6.1, the "marker" box
@ -3695,7 +3698,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
#else
PRBool allowJustify = PR_FALSE;
#endif
aLineLayout.TrimTrailingWhiteSpace(aLine->mBounds);
aLineLayout.HorizontalAlignFrames(aLine->mBounds, allowJustify);
aLineLayout.RelativePositionFrames(aLine->mCombinedArea);
if (addedBullet) {

View File

@ -3642,6 +3642,9 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
{
nsresult rv = NS_OK;
// Trim extra white-space from the line before placing the frames
aLineLayout.TrimTrailingWhiteSpace();
// Vertically align the frames on this line.
//
// According to the CSS2 spec, section 12.6.1, the "marker" box
@ -3695,7 +3698,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
#else
PRBool allowJustify = PR_FALSE;
#endif
aLineLayout.TrimTrailingWhiteSpace(aLine->mBounds);
aLineLayout.HorizontalAlignFrames(aLine->mBounds, allowJustify);
aLineLayout.RelativePositionFrames(aLine->mCombinedArea);
if (addedBullet) {

View File

@ -3642,6 +3642,9 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
{
nsresult rv = NS_OK;
// Trim extra white-space from the line before placing the frames
aLineLayout.TrimTrailingWhiteSpace();
// Vertically align the frames on this line.
//
// According to the CSS2 spec, section 12.6.1, the "marker" box
@ -3695,7 +3698,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
#else
PRBool allowJustify = PR_FALSE;
#endif
aLineLayout.TrimTrailingWhiteSpace(aLine->mBounds);
aLineLayout.HorizontalAlignFrames(aLine->mBounds, allowJustify);
aLineLayout.RelativePositionFrames(aLine->mCombinedArea);
if (addedBullet) {

View File

@ -3642,6 +3642,9 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
{
nsresult rv = NS_OK;
// Trim extra white-space from the line before placing the frames
aLineLayout.TrimTrailingWhiteSpace();
// Vertically align the frames on this line.
//
// According to the CSS2 spec, section 12.6.1, the "marker" box
@ -3695,7 +3698,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
#else
PRBool allowJustify = PR_FALSE;
#endif
aLineLayout.TrimTrailingWhiteSpace(aLine->mBounds);
aLineLayout.HorizontalAlignFrames(aLine->mBounds, allowJustify);
aLineLayout.RelativePositionFrames(aLine->mCombinedArea);
if (addedBullet) {

View File

@ -3642,6 +3642,9 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
{
nsresult rv = NS_OK;
// Trim extra white-space from the line before placing the frames
aLineLayout.TrimTrailingWhiteSpace();
// Vertically align the frames on this line.
//
// According to the CSS2 spec, section 12.6.1, the "marker" box
@ -3695,7 +3698,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
#else
PRBool allowJustify = PR_FALSE;
#endif
aLineLayout.TrimTrailingWhiteSpace(aLine->mBounds);
aLineLayout.HorizontalAlignFrames(aLine->mBounds, allowJustify);
aLineLayout.RelativePositionFrames(aLine->mCombinedArea);
if (addedBullet) {