Text with 'whitespace:nowrap' no longer uses special Win32-only text measurement code becasue it didn't work. b=42832 r=waterson

git-svn-id: svn://10.0.0.236/trunk@76036 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com
2000-08-10 23:03:11 +00:00
parent e147d2735e
commit e7b5464ded
2 changed files with 6 additions and 2 deletions

View File

@@ -3618,8 +3618,10 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext,
PRBool justDidFirstLetter = PR_FALSE;
#ifdef _WIN32
PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mPreformatted &&
!aTs.mSmallCaps && !aTs.mWordSpacing && !aTs.mLetterSpacing;
!aTs.mSmallCaps && !aTs.mWordSpacing && !aTs.mLetterSpacing &&
aTextData.mWrapping;
// Don't measure text runs with letter spacing active, it doesn't work
// it also doesn't work if we are not word-wrapping (bug 42832)
#else
PRBool measureTextRuns = PR_FALSE;
#endif