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

Re-checkin as it showed no impact on luna's TDHML bug 331661. Introduce a soft-break flag that means that a whitespace has been trimmed at the end of the line, and therefore its width has not been accounted for (this width can actually be large, e.g., if a large word-spacing is set). LineLayout should not be misled into placing something where the whitespace was trimmed. b=329987, r+sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@193030 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rbs%maths.uq.edu.au 2006-03-27 07:04:29 +00:00
parent bd271ab2d7
commit ea324b55a6
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/generic/nsLineLayout.h
View File

@ -160,7 +160,13 @@ protected:
#define LL_LASTFLOATWASLETTERFRAME 0x00000080
#define LL_CANPLACEFLOAT 0x00000100
#define LL_LINEENDSINBR 0x00000200
#define LL_LASTFLAG LL_LINEENDSINBR
// The "soft-break" flag differs from the "hard-break" flag of <br>. The
// "soft-break" means that a whitespace has been trimmed at the end of the line,
// and therefore its width has not been accounted for (this width can actually be
// large, e.g., if a large word-spacing is set). LL should not be misled into
// placing something where the whitespace was trimmed. See bug 329987.
#define LL_LINEENDSINSOFTBR 0x00000400
#define LL_LASTFLAG LL_LINEENDSINSOFTBR
PRUint16 mFlags;
@ -239,6 +245,16 @@ public:
SetFlag(LL_LINEENDSINBR, aOn);
}
PRBool GetLineEndsInSoftBR() const
{
return GetFlag(LL_LINEENDSINSOFTBR);
}
void SetLineEndsInSoftBR(PRBool aOn)
{
SetFlag(LL_LINEENDSINSOFTBR, aOn);
}
PRBool InStrictMode() const
{
return mCompatMode != eCompatibility_NavQuirks;

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

@ -5417,7 +5417,7 @@ nsTextFrame::MeasureText(nsPresContext* aPresContext,
// Note: word-spacing or letter-spacing can make the "space" really
// wide. But since this space is left out from our width, linelayout
// may still try to fit something narrower at the end of the line.
// So on return (see below), we flag a break-after status to ensure
// So on return (see below), we flag a soft-break status to ensure
// that linelayout doesn't place something where the "space" should
// be.
break;
@ -5854,11 +5854,17 @@ nsTextFrame::MeasureText(nsPresContext* aPresContext,
#endif // IBMBIDI
? NS_FRAME_COMPLETE
: NS_FRAME_NOT_COMPLETE;
if (endsInNewline || aTextData.mTrailingSpaceTrimmed) {
if (endsInNewline) {
rs = NS_INLINE_LINE_BREAK_AFTER(rs);
if (endsInNewline) {
lineLayout.SetLineEndsInBR(PR_TRUE);
}
lineLayout.SetLineEndsInBR(PR_TRUE);
}
else if (aTextData.mTrailingSpaceTrimmed && rs == NS_FRAME_COMPLETE) {
// Flag a soft-break that we can check (below) if we come back here
lineLayout.SetLineEndsInSoftBR(PR_TRUE);
}
else if (lineLayout.GetLineEndsInSoftBR() && !lineLayout.GetEndsInWhiteSpace()) {
// Break-before a word that follows the soft-break flagged earlier
rs = NS_INLINE_LINE_BREAK_BEFORE();
}
else if ((aTextData.mOffset != contentLength) && (aTextData.mOffset == startingOffset)) {
// Break-before a long-word that doesn't fit here