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

fixed nested listing bug, and prep work for new logparse system

Browse Source
This commit is contained in:
rickg%netscape.com 1999-01-13 08:43:20 +00:00
parent 6b16ccfd7f
commit 68750d1591
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htmlparser/src/CNavDTD.cpp
View File

@ -4,7 +4,7 @@
* Version 1.0 (the "NPL"); you may not use this file except in
* compliance with the NPL. You may obtain a copy of the NPL at
* http://www.mozilla.org/NPL/
*
*
* Software distributed under the NPL is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
* for the specific language governing rights and limitations under the
@ -669,8 +669,8 @@ eHTMLTags FindAutoCloseTargetForStartTag(eHTMLTags aCurrentTag,nsTagStack& aTagS
eHTMLTags aPrevTag=aTagStack.mTags[theTopIndex-1];
if(nsHTMLElement::IsContainer(aCurrentTag)){
if((aPrevTag==aCurrentTag) && (!gHTMLElements[aCurrentTag].CanSelfContain())){
return aCurrentTag;
if(aPrevTag==aCurrentTag) {
return (gHTMLElements[aCurrentTag].CanSelfContain()) ? eHTMLTag_unknown: aCurrentTag;
}
if(nsHTMLElement::IsBlockCloser(aCurrentTag)) {
@ -740,9 +740,9 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsI
if(eHTMLTag_unknown!=theTarget){
result=CloseContainersTo(theTarget,PR_TRUE);
theParentTag=mBodyContext->Last();
theCanContainResult=CanContain(theParentTag,aChildTag);
}
if(PR_FALSE==theCanContainResult){
if(CanPropagate(theParentTag,aChildTag))
result=CreateContextStackFor(aChildTag);

2
htmlparser/src/nsElementTable.h
View File

@ -360,6 +360,8 @@ public:
gHTMLElements[gStyleTags[index]].mSelfContained=PR_TRUE;
}
gHTMLElements[eHTMLTag_frameset].mSelfContained=PR_TRUE;
gHTMLElements[eHTMLTag_ol].mSelfContained=PR_TRUE;
gHTMLElements[eHTMLTag_ul].mSelfContained=PR_TRUE;
}
};
CTableInitializer gTableInitializer;

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

@ -4,7 +4,7 @@
* Version 1.0 (the "NPL"); you may not use this file except in
* compliance with the NPL. You may obtain a copy of the NPL at
* http://www.mozilla.org/NPL/
*
*
* Software distributed under the NPL is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
* for the specific language governing rights and limitations under the
@ -669,8 +669,8 @@ eHTMLTags FindAutoCloseTargetForStartTag(eHTMLTags aCurrentTag,nsTagStack& aTagS
eHTMLTags aPrevTag=aTagStack.mTags[theTopIndex-1];
if(nsHTMLElement::IsContainer(aCurrentTag)){
if((aPrevTag==aCurrentTag) && (!gHTMLElements[aCurrentTag].CanSelfContain())){
return aCurrentTag;
if(aPrevTag==aCurrentTag) {
return (gHTMLElements[aCurrentTag].CanSelfContain()) ? eHTMLTag_unknown: aCurrentTag;
}
if(nsHTMLElement::IsBlockCloser(aCurrentTag)) {
@ -740,9 +740,9 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsI
if(eHTMLTag_unknown!=theTarget){
result=CloseContainersTo(theTarget,PR_TRUE);
theParentTag=mBodyContext->Last();
theCanContainResult=CanContain(theParentTag,aChildTag);
}
if(PR_FALSE==theCanContainResult){
if(CanPropagate(theParentTag,aChildTag))
result=CreateContextStackFor(aChildTag);

2
parser/htmlparser/src/nsElementTable.h
View File

@ -360,6 +360,8 @@ public:
gHTMLElements[gStyleTags[index]].mSelfContained=PR_TRUE;
}
gHTMLElements[eHTMLTag_frameset].mSelfContained=PR_TRUE;
gHTMLElements[eHTMLTag_ol].mSelfContained=PR_TRUE;
gHTMLElements[eHTMLTag_ul].mSelfContained=PR_TRUE;
}
};
CTableInitializer gTableInitializer;