Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 345071. Fix PrepareUnicodeText to handle words in the current textnode that extend past the end of the frame. r=smontagu,sr=rbs

Browse Source
This commit is contained in:
roc+%cs.cmu.edu 2006-08-16 01:57:06 +00:00
parent 4a4a22c9a0
commit 4624c28ff3
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/generic/nsTextFrame.cpp
View File

@ -2192,12 +2192,9 @@ nsTextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
aTX.GetNextWord(PR_FALSE, &wordLen, &contentLen, &isWhitespace, &wasTransformed);
// we trip this assertion in bug 31053, but I think it's unnecessary
//NS_ASSERTION(isWhitespace, "mState and content are out of sync");
#ifdef IBMBIDI
if (mState & NS_FRAME_IS_BIDI
&& contentLen > mContentLength) {
contentLen = mContentLength;
if (contentLen > n) {
contentLen = n;
}
#endif // IBMBIDI
if (isWhitespace) {
if (nsnull != indexp) {
@ -2246,16 +2243,14 @@ nsTextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
}
break;
}
// for ::first-letter or bidi, the content may be chopped
if (mState & (TEXT_FIRST_LETTER | NS_FRAME_IS_BIDI)) {
// XXX: doesn't support the case where the first-letter expands, e.g.,
// with text-transform:capitalize, the German szlig; becomes SS.
if (contentLen > n) {
contentLen = n;
}
if (wordLen > n) {
wordLen = n;
}
// the frame may not map the entire word
// XXX: doesn't support the case where the first-letter expands, e.g.,
// with text-transform:capitalize, the German szlig; becomes SS.
if (contentLen > n) {
contentLen = n;
}
if (wordLen > n) {
wordLen = n;
}
inWord = PR_FALSE;
if (isWhitespace) {