wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 488730 - Count newlines correctly when skipping whitespace. r+sr=sicking

Browse Source
This commit is contained in:
Blake Kaplan 2009-06-01 20:44:37 -07:00
parent cbd6ab1481
commit ed18be0cf5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parser/htmlparser/src/CNavDTD.cpp
View File

@ -1569,7 +1569,7 @@ FindAutoCloseTargetForEndTag(eHTMLTags aCurrentTag, nsDTDContext& aContext,
static void
StripWSFollowingTag(eHTMLTags aChildTag, nsITokenizer* aTokenizer,
nsTokenAllocator* aTokenAllocator, PRInt32& aNewlineCount)
nsTokenAllocator* aTokenAllocator, PRInt32* aNewlineCount)
{
if (!aTokenizer || !aTokenAllocator) {
return;
@ -1577,16 +1577,15 @@ StripWSFollowingTag(eHTMLTags aChildTag, nsITokenizer* aTokenizer,
CToken* theToken = aTokenizer->PeekToken();
PRInt32 newlineCount = 0;
while (theToken) {
eHTMLTokenTypes theType = eHTMLTokenTypes(theToken->GetTokenType());
switch(theType) {
case eToken_newline:
++aNewlineCount;
// Fall through...
case eToken_whitespace:
theToken = aTokenizer->PopToken();
newlineCount += theToken->GetNewlineCount();
IF_FREE(theToken, aTokenAllocator);
theToken = aTokenizer->PeekToken();
@ -1597,6 +1596,10 @@ StripWSFollowingTag(eHTMLTags aChildTag, nsITokenizer* aTokenizer,
break;
}
}
if (aNewlineCount) {
*aNewlineCount += newlineCount;
}
}
/**
@ -1628,7 +1631,8 @@ CNavDTD::HandleEndToken(CToken* aToken)
break;
case eHTMLTag_head:
StripWSFollowingTag(theChildTag, mTokenizer, mTokenAllocator, mLineNumber);
StripWSFollowingTag(theChildTag, mTokenizer, mTokenAllocator,
IsParserInDocWrite() ? nsnull : &mLineNumber);
if (mBodyContext->LastOf(eHTMLTag_head) != kNotFound) {
result = CloseContainersTo(eHTMLTag_head, PR_FALSE);
}
@ -1656,7 +1660,7 @@ CNavDTD::HandleEndToken(CToken* aToken)
case eHTMLTag_body:
case eHTMLTag_html:
StripWSFollowingTag(theChildTag, mTokenizer, mTokenAllocator,
mLineNumber);
IsParserInDocWrite() ? nsnull : &mLineNumber);
break;
case eHTMLTag_script: