Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-14 00:14:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up HandleOmittedTag() and HandleSavedTokensAbove().

Browse Source
This commit is contained in:
harishd%netscape.com 1999-04-25 21:55:05 +00:00
parent 4c4c9c8a45
commit fc1568ebb0
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htmlparser/src/CNavDTD.cpp
View File

@ -1157,8 +1157,9 @@ nsresult CNavDTD::HandleOmittedTag(CToken* aToken,eHTMLTags aChildTag,eHTMLTags
if(!FindTagInSet(aChildTag,gWhitespaceTags,sizeof(gWhitespaceTags)/sizeof(aChildTag))) {
isNotWhiteSpace = mSaveBadTokens = PR_TRUE;
}
if(mSaveBadTokens &&(isNotWhiteSpace || mBodyContext->TokenCountAt(theBCIndex) > 0)) {
if(mSaveBadTokens) {
mBodyContext->SaveToken(aToken,theBCIndex);
// If the token is attributed then save those attributes too.
if(attrCount > 0) {
nsCParserNode* theAttrNode = (nsCParserNode*)&aNode;
while(attrCount > 0){
@ -1460,18 +1461,12 @@ nsresult CNavDTD::HandleSavedTokensAbove(eHTMLTags aTag)
if(theTag != eHTMLTag_unknown) {
attrCount = theToken->GetAttributeCount();
// Put back attributes, which once got popped out, into the tokenizer
if(attrCount > 0) {
PRInt32 theAttrCount = 0;
for(PRInt32 i=0;i<attrCount; i++){
CToken* theAttrToken = mBodyContext->RestoreTokenFrom(theBadContentIndex);
if(theAttrToken) {
mTokenizer->PushTokenFront(theAttrToken);
theAttrCount++;
}
theBadTokenCount--;
for(PRInt32 i=0;i<attrCount; i++){
CToken* theAttrToken = mBodyContext->RestoreTokenFrom(theBadContentIndex);
if(theAttrToken) {
mTokenizer->PushTokenFront(theAttrToken);
}
// XXX Hack. Wonder why the attribute count changes, sometimes!!!!!!
theToken->SetAttributeCount(theAttrCount);
theBadTokenCount--;
}
result = HandleStartToken(theToken);
}
@ -1482,7 +1477,8 @@ nsresult CNavDTD::HandleSavedTokensAbove(eHTMLTags aTag)
CloseContainersTo(mBodyContext->TagAt(theTopIndex),PR_TRUE);
}
// Put back tags, in temp context, into body context
// Bad-contents were successfully processed. Now, itz time to get
// back to the original body context state.
for(PRInt32 j=0; j<(theTagCount - theTopIndex); j++)
mBodyContext->Push(temp.Pop());

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

@ -1157,8 +1157,9 @@ nsresult CNavDTD::HandleOmittedTag(CToken* aToken,eHTMLTags aChildTag,eHTMLTags
if(!FindTagInSet(aChildTag,gWhitespaceTags,sizeof(gWhitespaceTags)/sizeof(aChildTag))) {
isNotWhiteSpace = mSaveBadTokens = PR_TRUE;
}
if(mSaveBadTokens &&(isNotWhiteSpace || mBodyContext->TokenCountAt(theBCIndex) > 0)) {
if(mSaveBadTokens) {
mBodyContext->SaveToken(aToken,theBCIndex);
// If the token is attributed then save those attributes too.
if(attrCount > 0) {
nsCParserNode* theAttrNode = (nsCParserNode*)&aNode;
while(attrCount > 0){
@ -1460,18 +1461,12 @@ nsresult CNavDTD::HandleSavedTokensAbove(eHTMLTags aTag)
if(theTag != eHTMLTag_unknown) {
attrCount = theToken->GetAttributeCount();
// Put back attributes, which once got popped out, into the tokenizer
if(attrCount > 0) {
PRInt32 theAttrCount = 0;
for(PRInt32 i=0;i<attrCount; i++){
CToken* theAttrToken = mBodyContext->RestoreTokenFrom(theBadContentIndex);
if(theAttrToken) {
mTokenizer->PushTokenFront(theAttrToken);
theAttrCount++;
}
theBadTokenCount--;
for(PRInt32 i=0;i<attrCount; i++){
CToken* theAttrToken = mBodyContext->RestoreTokenFrom(theBadContentIndex);
if(theAttrToken) {
mTokenizer->PushTokenFront(theAttrToken);
}
// XXX Hack. Wonder why the attribute count changes, sometimes!!!!!!
theToken->SetAttributeCount(theAttrCount);
theBadTokenCount--;
}
result = HandleStartToken(theToken);
}
@ -1482,7 +1477,8 @@ nsresult CNavDTD::HandleSavedTokensAbove(eHTMLTags aTag)
CloseContainersTo(mBodyContext->TagAt(theTopIndex),PR_TRUE);
}
// Put back tags, in temp context, into body context
// Bad-contents were successfully processed. Now, itz time to get
// back to the original body context state.
for(PRInt32 j=0; j<(theTagCount - theTopIndex); j++)
mBodyContext->Push(temp.Pop());