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

bug 142965: Handling misplaced content with a stray end tag around causes the tag that caused us to handle the misplaced content to lose its attributes. r=jst sr+a=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@174633 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2005-06-15 18:20:29 +00:00
parent c938cd0bfb
commit 427f731b67
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/parser/htmlparser/src/CNavDTD.cpp
View File

@@ -1944,10 +1944,27 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
// Ex. <html><body>Hello</P>There</body></html>
PRBool theParentContains=-1; //set to -1 to force canomit to recompute.
if(!CanOmit(theParentTag,theChildTag,theParentContains)) {
IF_HOLD(aToken);
mTokenizer->PushTokenFront(aToken); //put this end token back...
CHTMLToken* theToken = NS_STATIC_CAST(CHTMLToken*,mTokenAllocator->CreateTokenOfType(eToken_start,theChildTag));
mTokenizer->PushTokenFront(theToken); //put this new token onto stack...
CHTMLToken* theStartToken = NS_STATIC_CAST(CHTMLToken*,mTokenAllocator->CreateTokenOfType(eToken_start,theChildTag));
// This check for NS_DTD_FLAG_IN_MISPLACED_CONTENT was added
// to fix bug 142965.
if (!(mFlags & NS_DTD_FLAG_IN_MISPLACED_CONTENT)) {
// We're not handling misplaced content right now, just push
// these new tokens back on the stack and handle them in the
// regular flow of HandleToken.
IF_HOLD(aToken);
mTokenizer->PushTokenFront(aToken); //put this end token back...
mTokenizer->PushTokenFront(theStartToken); //put the new token onto the stack...
}
else {
// Oops, we're in misplaced content. Handle these tokens
// directly instead of trying to push them onto the tokenizer
// stack.
result = HandleToken(theStartToken, mParser);
NS_ENSURE_SUCCESS(result, result);
result = HandleToken(aToken, mParser);
}
}
}
return result;