From 24bc2c902ea78f25d25dcadcb7033559f7e3fa79 Mon Sep 17 00:00:00 2001 From: "harishd%netscape.com" Date: Mon, 22 Mar 1999 18:46:01 +0000 Subject: [PATCH] Ignoring unwanted tags in git-svn-id: svn://10.0.0.236/trunk@24672 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/CNavDTD.cpp | 5 ++++- mozilla/parser/htmlparser/src/CNavDTD.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index d0855134ded..df766c30101 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -1693,10 +1693,13 @@ PRBool CNavDTD::CanOmit(eHTMLTags aParent,eHTMLTags aChild) const { CTagList* theParents=gHTMLElements[aChild].GetSpecialParents(); if(theParents) { PRInt32 theParentIndex=theParents->GetTopmostIndexOf(mBodyContext->mTags); - result=PRBool(kNotFound==theParentIndex); + return PRBool(kNotFound==theParentIndex); // result=!theParents->Contains(aParent); THE OLD WAY } } + if(!gHTMLElements[aParent].CanContain(aChild)){ + return PR_TRUE; + } break; } //switch break; diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index d0855134ded..df766c30101 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -1693,10 +1693,13 @@ PRBool CNavDTD::CanOmit(eHTMLTags aParent,eHTMLTags aChild) const { CTagList* theParents=gHTMLElements[aChild].GetSpecialParents(); if(theParents) { PRInt32 theParentIndex=theParents->GetTopmostIndexOf(mBodyContext->mTags); - result=PRBool(kNotFound==theParentIndex); + return PRBool(kNotFound==theParentIndex); // result=!theParents->Contains(aParent); THE OLD WAY } } + if(!gHTMLElements[aParent].CanContain(aChild)){ + return PR_TRUE; + } break; } //switch break;