corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not part of the build. Don't trim whitespace if wrapping is disabled. Don't compress a space that's preceded by an incompressible space.

Browse Source
This commit is contained in:
2007-05-27 19:20:58 -07:00
parent 8649f8e7f6
commit 911e64ddf9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsTextFrameThebes.cpp
View File

@@ -1398,6 +1398,11 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
aTextBuffer = end; aTextBuffer = end;
} }
} }
// In CSS 2.1, we do not compress a space that is preceded by a non-compressible
// space.
if (!compressWhitespace) {
mTrimNextRunLeadingWhitespace = PR_FALSE;
}
textFlags |= analysisFlags; textFlags |= analysisFlags;
currentTransformedTextOffset = currentTransformedTextOffset =
@@ -4899,7 +4904,8 @@ nsTextFrame::Reflow(nsPresContext* aPresContext,
PRBool usedHyphenation; PRBool usedHyphenation;
gfxFloat trimmedWidth = 0; gfxFloat trimmedWidth = 0;
gfxFloat availWidth = aReflowState.availableWidth; gfxFloat availWidth = aReflowState.availableWidth;
PRBool canTrimTrailingWhitespace = !textStyle->WhiteSpaceIsSignificant(); PRBool canTrimTrailingWhitespace = !textStyle->WhiteSpaceIsSignificant() &&
textStyle->WhiteSpaceCanWrap();
PRUint32 transformedCharsFit = PRUint32 transformedCharsFit =
mTextRun->BreakAndMeasureText(transformedOffset, transformedLength, mTextRun->BreakAndMeasureText(transformedOffset, transformedLength,
(GetStateBits() & TEXT_START_OF_LINE) != 0, (GetStateBits() & TEXT_START_OF_LINE) != 0,