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

bug 320883: Handle split newlines at the end of chunks without duplicating newlines. r=bzbarsky rs=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@188135 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2006-01-25 02:29:09 +00:00
parent f1ab9ff32e
commit 4842e83eec
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -521,25 +521,41 @@ CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner, PRInt32 aFlag)
result = aScanner.Peek(aChar);
if (NS_OK == result && (kCR == aChar || kNewLine == aChar)) {
result = aScanner.GetChar(aChar); // Strip off the char
PRUnichar theNextChar;
result = aScanner.Peek(theNextChar); // Then see what's next.
switch (aChar) {
case kCR:
{
// It's a carriage return. See if this is part of a CR-LF pair (in
// which case we need to treat it as one newline). If we're at the
// edge of a packet, then leave the CR on the scanner, since it
// could still be part of a CR-LF pair. Otherwise, it isn't.
PRUnichar theNextChar;
result = aScanner.Peek(theNextChar, 1);
if (result == kEOF && aScanner.IsIncremental()) {
break;
}
if (NS_SUCCEEDED(result)) {
// Actually get the carriage return.
aScanner.GetChar(aChar);
}
if (kLF == theNextChar) {
// If the "\r" is followed by a "\n", don't replace it and
// let it be ignored by the layout system
// If the "\r" is followed by a "\n", don't replace it and let
// it be ignored by the layout system.
end.advance(2);
result = aScanner.GetChar(theNextChar);
aScanner.GetChar(theNextChar);
} else {
// If it standalone, replace the "\r" with a "\n" so that
// it will be considered by the layout system
// If it is standalone, replace the "\r" with a "\n" so that it
// will be considered by the layout system.
aScanner.ReplaceCharacter(end, kLF);
++end;
}
++mNewlineCount;
break;
}
case kLF:
aScanner.GetChar(aChar);
++end;
++mNewlineCount;
break;
@@ -550,6 +566,9 @@ CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner, PRInt32 aFlag)
}
}
// Note: This function is only called from nsHTMLTokenizer::ConsumeText. If
// we return an error result from the final buffer, then it is responsible
// for turning it into an NS_OK result.
aScanner.BindSubstring(mTextValue, origin, end);
return result;