mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Back out shanjian's last change as it was causing several whitespace-related regressions. r=attinasi

This commit is contained in:
waterson%netscape.com 2000-08-14 22:11:41 +00:00
Родитель a54f17cc75
Коммит 775c5e9f89
2 изменённых файлов: 16 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

49
layout/generic/nsTextTransformer.cpp
Просмотреть файл

@ -254,7 +254,6 @@ nsTextTransformer::ScanNormalAsciiText_F(PRInt32* aWordLen,
PRInt32 fragLen = frag->GetLength();
PRInt32 offset = mOffset;
PRInt32 prevBufferPos = mBufferPos;
PRBool breakAfterThis = PR_FALSE;
const unsigned char* cp = (const unsigned char*)frag->Get1b() + offset;
union {
unsigned char* bp1;
@ -267,24 +266,16 @@ nsTextTransformer::ScanNormalAsciiText_F(PRInt32* aWordLen,
bp2 += mBufferPos;
}
for (; offset < fragLen && !breakAfterThis; offset++) {
for (; offset < fragLen; offset++) {
unsigned char ch = *cp++;
if (XP_IS_SPACE(ch)) {
break;
}
if (CH_NBSP == ch) {
ch = ' ';
*aWasTransformed = PR_TRUE;
}
if (XP_IS_SPACE(ch)) {
break;
}
/* if (CH_NBSP == ch) {
ch = ' ';
*aWasTransformed = PR_TRUE;
if (offset == mOffset)
breakAfterThis = PR_TRUE;
else
break;
}
*/ else if (IS_DISCARDED(ch)) {
else if (IS_DISCARDED(ch)) {
// Strip discarded characters from the transformed output
continue;
}
@ -641,23 +632,6 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
wordLen = 1;
isWhitespace = PR_TRUE;
}
else if (CH_NBSP == firstChar) {
wordLen = 1;
isWhitespace = PR_TRUE;
*aWasTransformed = PR_TRUE;
// Make sure we have enough room in the transform buffer
if (mBufferPos >= mTransformBuf.mBufferLen) {
mTransformBuf.GrowBy(128);
}
offset++;
if (mTransformedTextIsAscii) {
((unsigned char*)mTransformBuf.mBuffer)[mBufferPos++] = ' ';
} else {
mTransformBuf.mBuffer[mBufferPos++] = PRUnichar(' ');
}
}
else if (frag->Is2b()) {
offset = ScanNormalUnicodeText_F(aForLineBreak, &wordLen, aWasTransformed);
}
@ -821,15 +795,14 @@ nsTextTransformer::ScanNormalAsciiText_B(PRInt32* aWordLen)
PRUnichar* bp = mTransformBuf.GetBufferEnd();
PRUnichar* startbp = mTransformBuf.GetBuffer();
while (--offset >= 0) {
PRUnichar ch = frag->CharAt(offset);
if (CH_NBSP == ch) {
ch = ' ';
}
if (XP_IS_SPACE(ch)) {
break;
}
if (CH_NBSP == ch) {
ch = ' ';
}
else if (IS_DISCARDED(ch)) {
continue;
}
@ -1036,12 +1009,6 @@ nsTextTransformer::GetPrevWord(PRBool aInWord,
wordLen = 1;
isWhitespace = PR_TRUE;
}
else if (CH_NBSP == firstChar) {
wordLen = 1;
isWhitespace = PR_TRUE;
mTransformBuf.mBuffer[mTransformBuf.mBufferLen - 1] = ' ';
offset--;
}
else if (frag->Is2b()) {
offset = ScanNormalUnicodeText_B(aForLineBreak, &wordLen);
}

49
layout/html/base/src/nsTextTransformer.cpp
Просмотреть файл

@ -254,7 +254,6 @@ nsTextTransformer::ScanNormalAsciiText_F(PRInt32* aWordLen,
PRInt32 fragLen = frag->GetLength();
PRInt32 offset = mOffset;
PRInt32 prevBufferPos = mBufferPos;
PRBool breakAfterThis = PR_FALSE;
const unsigned char* cp = (const unsigned char*)frag->Get1b() + offset;
union {
unsigned char* bp1;
@ -267,24 +266,16 @@ nsTextTransformer::ScanNormalAsciiText_F(PRInt32* aWordLen,
bp2 += mBufferPos;
}
for (; offset < fragLen && !breakAfterThis; offset++) {
for (; offset < fragLen; offset++) {
unsigned char ch = *cp++;
if (XP_IS_SPACE(ch)) {
break;
}
if (CH_NBSP == ch) {
ch = ' ';
*aWasTransformed = PR_TRUE;
}
if (XP_IS_SPACE(ch)) {
break;
}
/* if (CH_NBSP == ch) {
ch = ' ';
*aWasTransformed = PR_TRUE;
if (offset == mOffset)
breakAfterThis = PR_TRUE;
else
break;
}
*/ else if (IS_DISCARDED(ch)) {
else if (IS_DISCARDED(ch)) {
// Strip discarded characters from the transformed output
continue;
}
@ -641,23 +632,6 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
wordLen = 1;
isWhitespace = PR_TRUE;
}
else if (CH_NBSP == firstChar) {
wordLen = 1;
isWhitespace = PR_TRUE;
*aWasTransformed = PR_TRUE;
// Make sure we have enough room in the transform buffer
if (mBufferPos >= mTransformBuf.mBufferLen) {
mTransformBuf.GrowBy(128);
}
offset++;
if (mTransformedTextIsAscii) {
((unsigned char*)mTransformBuf.mBuffer)[mBufferPos++] = ' ';
} else {
mTransformBuf.mBuffer[mBufferPos++] = PRUnichar(' ');
}
}
else if (frag->Is2b()) {
offset = ScanNormalUnicodeText_F(aForLineBreak, &wordLen, aWasTransformed);
}
@ -821,15 +795,14 @@ nsTextTransformer::ScanNormalAsciiText_B(PRInt32* aWordLen)
PRUnichar* bp = mTransformBuf.GetBufferEnd();
PRUnichar* startbp = mTransformBuf.GetBuffer();
while (--offset >= 0) {
PRUnichar ch = frag->CharAt(offset);
if (CH_NBSP == ch) {
ch = ' ';
}
if (XP_IS_SPACE(ch)) {
break;
}
if (CH_NBSP == ch) {
ch = ' ';
}
else if (IS_DISCARDED(ch)) {
continue;
}
@ -1036,12 +1009,6 @@ nsTextTransformer::GetPrevWord(PRBool aInWord,
wordLen = 1;
isWhitespace = PR_TRUE;
}
else if (CH_NBSP == firstChar) {
wordLen = 1;
isWhitespace = PR_TRUE;
mTransformBuf.mBuffer[mTransformBuf.mBufferLen - 1] = ' ';
offset--;
}
else if (frag->Is2b()) {
offset = ScanNormalUnicodeText_B(aForLineBreak, &wordLen);
}