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

42429 - Preserve newline/whitespace inside TABLE,TR,TBODY,THEAD,TFOOT

Browse Source 
50710 - Stop after popping a style stack otherwise it might cause a MLK
r=rickg
This commit is contained in:
harishd%netscape.com 2000-09-12 21:17:47 +00:00
parent ce4f6ba3c2
commit 90be3bf596
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htmlparser/src/CNavDTD.cpp
View File

@ -1781,7 +1781,6 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
case eHTMLTag_noframes:
case eHTMLTag_noembed:
case eHTMLTag_noscript:
mHasOpenNoXXX--;
//and allow to fall through...
@ -2318,6 +2317,14 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const {
}
}
#endif
if(!result) {
// Bug 42429 - Preserve whitespace inside TABLE,TR,TBODY,TFOOT,etc.,
if(gHTMLElements[aParent].HasSpecialProperty(kBadContentWatch)) {
if(nsHTMLElement::IsWhitespaceTag((eHTMLTags)aChild)) {
result=PR_TRUE;
}
}
}
return result;
}
@ -3181,6 +3188,7 @@ nsresult CNavDTD::CloseNoscript(const nsIParserNode *aNode) {
START_TIMER();
if(NS_SUCCEEDED(result)) {
NS_ASSERTION((mHasOpenNoXXX > -1), "mHasOpenNoXXX underflow");
if(mHasOpenNoXXX > 0) {
mHasOpenNoXXX--;
}

1
htmlparser/src/nsDTDUtils.cpp
View File

@ -1079,6 +1079,7 @@ nsIParserNode* nsDTDContext::PopStyle(eHTMLTags aTag){
if(aTag==theStack->Last()) {
result=theStack->Pop();
mResidualStyleCount--;
break; // Fix bug 50710 - Stop after finding a style.
} else {
// NS_ERROR("bad residual style entry");
}

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

@ -1781,7 +1781,6 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
case eHTMLTag_noframes:
case eHTMLTag_noembed:
case eHTMLTag_noscript:
mHasOpenNoXXX--;
//and allow to fall through...
@ -2318,6 +2317,14 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const {
}
}
#endif
if(!result) {
// Bug 42429 - Preserve whitespace inside TABLE,TR,TBODY,TFOOT,etc.,
if(gHTMLElements[aParent].HasSpecialProperty(kBadContentWatch)) {
if(nsHTMLElement::IsWhitespaceTag((eHTMLTags)aChild)) {
result=PR_TRUE;
}
}
}
return result;
}
@ -3181,6 +3188,7 @@ nsresult CNavDTD::CloseNoscript(const nsIParserNode *aNode) {
START_TIMER();
if(NS_SUCCEEDED(result)) {
NS_ASSERTION((mHasOpenNoXXX > -1), "mHasOpenNoXXX underflow");
if(mHasOpenNoXXX > 0) {
mHasOpenNoXXX--;
}

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

@ -1079,6 +1079,7 @@ nsIParserNode* nsDTDContext::PopStyle(eHTMLTags aTag){
if(aTag==theStack->Last()) {
result=theStack->Pop();
mResidualStyleCount--;
break; // Fix bug 50710 - Stop after finding a style.
} else {
// NS_ERROR("bad residual style entry");
}