Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nsTextFrameThebes ClusterIterator misuses memset plus cleanup b=387964 r+sr=roc

Browse Source
This commit is contained in:
neil@parkwaycc.co.uk 2007-07-13 01:22:00 -07:00
parent 9fb0dfd8be
commit 923ed0fc49
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/generic/nsTextFrameThebes.cpp
View File

@ -4749,29 +4749,18 @@ ClusterIterator::ClusterIterator(nsTextFrame* aTextFrame, PRInt32 aPosition,
mFrag = aTextFrame->GetContent()->GetText();
mTrimmed = aTextFrame->GetTrimmedOffsets(mFrag, PR_TRUE);
if (!mWordBreaks.AppendElements(aTextFrame->GetContentLength())) {
PRInt32 textLen = aTextFrame->GetContentLength();
if (!mWordBreaks.AppendElements(textLen)) {
mDirection = 0; // signal failure
return;
}
memset(mWordBreaks.Elements(), PR_FALSE, textLen);
nsAutoString text;
PRInt32 textLen = aTextFrame->GetContentLength();
mFrag->AppendTo(text, aTextFrame->GetContentOffset(), textLen);
nsIWordBreaker* wordBreaker = nsContentUtils::WordBreaker();
PRInt32 i = 0;
if (i < textLen) {
mWordBreaks[i] = PR_FALSE;
}
while (i < textLen) {
PRInt32 nextWord = wordBreaker->NextWord(text.get(), textLen, i);
if (nextWord < 0) {
if (i + 1 < textLen) {
memset(&mWordBreaks[i + 1], textLen - i - 1, PR_FALSE);
}
break;
}
i = nextWord;
while ((i = wordBreaker->NextWord(text.get(), textLen, i)) >= 0)
mWordBreaks[i] = PR_TRUE;
}
}
PRBool