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

fix bug 6901 per CYEH

Browse Source
This commit is contained in:
rickg%netscape.com 1999-05-21 23:01:37 +00:00
parent 9e1116af2d
commit 62cee0b406
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htmlparser/src/nsHTMLTokenizer.cpp
View File

@ -343,6 +343,7 @@ nsresult nsHTMLTokenizer::ConsumeTag(PRUnichar aChar,CToken*& aToken,nsScanner&
result=ConsumeStartTag(aChar,aToken,aScanner);
else if(kEOF!=aChar) {
nsAutoString temp("<");
temp.Append(aChar);
result=ConsumeText(temp,aToken,aScanner);
}
} //switch
@ -457,14 +458,14 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
*/
if(NS_SUCCEEDED(result))
if((eHTMLTag_style==theTag) || (eHTMLTag_script==theTag)) {
nsAutoString endTag("</");
endTag.Append(NS_EnumToTag(theTag));
endTag.Append(">");
nsAutoString endTag(NS_EnumToTag(theTag));
CTokenRecycler* theRecycler=(CTokenRecycler*)GetTokenRecycler();
CToken* endToken=theRecycler->CreateTokenOfType(eToken_end,theTag,endTag);
endTag.Insert("</",0,2);
endTag.Append(">");
CToken* textToken=theRecycler->CreateTokenOfType(eToken_text,theTag,endTag);
result=((CTextToken*)textToken)->ConsumeUntil(0,PRBool(eHTMLTag_style==theTag),aScanner,endTag); //tell new token to finish consuming text...
AddToken(textToken,result,mTokenDeque,theRecycler);
CToken* endToken=theRecycler->CreateTokenOfType(eToken_end,theTag);
AddToken(endToken,result,mTokenDeque,theRecycler);
}

1
htmlparser/src/nsHTMLTokens.cpp
View File

@ -292,6 +292,7 @@ void CStartToken::GetSource(nsString& anOutputString){
* @return
*/
CEndToken::CEndToken(eHTMLTags aTag) : CHTMLToken(aTag) {
SetStringValue(GetTagName(aTag));
}

9
parser/htmlparser/src/nsHTMLTokenizer.cpp
View File

@ -343,6 +343,7 @@ nsresult nsHTMLTokenizer::ConsumeTag(PRUnichar aChar,CToken*& aToken,nsScanner&
result=ConsumeStartTag(aChar,aToken,aScanner);
else if(kEOF!=aChar) {
nsAutoString temp("<");
temp.Append(aChar);
result=ConsumeText(temp,aToken,aScanner);
}
} //switch
@ -457,14 +458,14 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
*/
if(NS_SUCCEEDED(result))
if((eHTMLTag_style==theTag) || (eHTMLTag_script==theTag)) {
nsAutoString endTag("</");
endTag.Append(NS_EnumToTag(theTag));
endTag.Append(">");
nsAutoString endTag(NS_EnumToTag(theTag));
CTokenRecycler* theRecycler=(CTokenRecycler*)GetTokenRecycler();
CToken* endToken=theRecycler->CreateTokenOfType(eToken_end,theTag,endTag);
endTag.Insert("</",0,2);
endTag.Append(">");
CToken* textToken=theRecycler->CreateTokenOfType(eToken_text,theTag,endTag);
result=((CTextToken*)textToken)->ConsumeUntil(0,PRBool(eHTMLTag_style==theTag),aScanner,endTag); //tell new token to finish consuming text...
AddToken(textToken,result,mTokenDeque,theRecycler);
CToken* endToken=theRecycler->CreateTokenOfType(eToken_end,theTag);
AddToken(endToken,result,mTokenDeque,theRecycler);
}

1
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@ -292,6 +292,7 @@ void CStartToken::GetSource(nsString& anOutputString){
* @return
*/
CEndToken::CEndToken(eHTMLTags aTag) : CHTMLToken(aTag) {
SetStringValue(GetTagName(aTag));
}