Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#114826

Browse Source 
r=mkaply, a=asa for drivers
OS/2 only - back out OS/2 specific fix to fix regression
I'm checking this in now so I can make our automatic daily build on OS/2


git-svn-id: svn://10.0.0.236/trunk@110408 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2001-12-12 23:14:55 +00:00
parent 300b42a22d
commit f69d3e7ed6
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/layout/generic/nsTextFrame.cpp
View File

@@ -4399,16 +4399,12 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext,
PRBool endsInNewline = PR_FALSE;
PRBool justDidFirstLetter = PR_FALSE;
nsTextDimensions dimensions, lastWordDimensions;
#if defined(_WIN32)
#if defined(_WIN32) || defined(XP_OS2)
PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mPreformatted &&
!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)
#elif defined(XP_OS2)
PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mSmallCaps &&
!aTs.mWordSpacing && !aTs.mLetterSpacing &&
aTextData.mWrapping;
#else
PRBool measureTextRuns = PR_FALSE;
#endif

6
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@@ -4399,16 +4399,12 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext,
PRBool endsInNewline = PR_FALSE;
PRBool justDidFirstLetter = PR_FALSE;
nsTextDimensions dimensions, lastWordDimensions;
#if defined(_WIN32)
#if defined(_WIN32) || defined(XP_OS2)
PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mPreformatted &&
!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)
#elif defined(XP_OS2)
PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mSmallCaps &&
!aTs.mWordSpacing && !aTs.mLetterSpacing &&
aTextData.mWrapping;
#else
PRBool measureTextRuns = PR_FALSE;
#endif