From 8150122c513c27f9e42a13270526f16dc9c62eb1 Mon Sep 17 00:00:00 2001 From: "mrbkap@gmail.com" Date: Fri, 13 Jul 2007 17:26:46 -0700 Subject: [PATCH] Don't treat PRBool as an int. bug 388093, r+sr=jst --- parser/htmlparser/src/CNavDTD.cpp | 10 +++++----- parser/htmlparser/src/CNavDTD.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 8eddf24958e..daf80918edf 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -868,7 +868,7 @@ CNavDTD::HandleDefaultStartToken(CToken* aToken, eHTMLTags aChildTag, if (mParserCommand != eViewFragment) { PRBool theChildAgrees = PR_TRUE; PRInt32 theIndex = mBodyContext->GetCount(); - PRBool theParentContains = -1; + PRBool theParentContains = PR_FALSE; do { eHTMLTags theParentTag = mBodyContext->TagAt(--theIndex); @@ -1636,7 +1636,7 @@ CNavDTD::HandleEndToken(CToken* aToken) // break in such cases. So, let's simulate that effect for // compatibility. // Ex. Hello

There - PRBool theParentContains = -1; + PRInt32 theParentContains = -1; if (!CanOmit(theParentTag, theChildTag, theParentContains)) { CToken* theStartToken = mTokenAllocator->CreateTokenOfType(eToken_start, theChildTag); @@ -1836,7 +1836,7 @@ CNavDTD::HandleEntityToken(CToken* aToken) nsCParserNode* theNode = mNodeAllocator.CreateNode(aToken, mTokenAllocator); NS_ENSURE_TRUE(theNode, NS_ERROR_OUT_OF_MEMORY); - PRBool theParentContains = -1; + PRInt32 theParentContains = -1; if (CanOmit(theParentTag, eHTMLTag_entity, theParentContains)) { eHTMLTags theCurrTag = (eHTMLTags)aToken->GetTypeID(); HandleOmittedTag(aToken, theCurrTag, theParentTag, theNode); @@ -2113,7 +2113,7 @@ CNavDTD::IsInlineElement(PRInt32 aTagID, PRInt32 aParentID) const */ PRBool CNavDTD::CanPropagate(eHTMLTags aParent, eHTMLTags aChild, - PRBool aParentContains) + PRInt32 aParentContains) { PRBool result = PR_FALSE; if (aParentContains == -1) { @@ -2161,7 +2161,7 @@ CNavDTD::CanPropagate(eHTMLTags aParent, eHTMLTags aChild, * @return PR_TRUE if given tag can contain other tags */ PRBool -CNavDTD::CanOmit(eHTMLTags aParent, eHTMLTags aChild, PRBool& aParentContains) +CNavDTD::CanOmit(eHTMLTags aParent, eHTMLTags aChild, PRInt32& aParentContains) { eHTMLTags theAncestor = gHTMLElements[aChild].mExcludingAncestor; if (eHTMLTag_unknown != theAncestor && HasOpenContainer(theAncestor)) { diff --git a/parser/htmlparser/src/CNavDTD.h b/parser/htmlparser/src/CNavDTD.h index 9255b9cd88b..71b643fefde 100644 --- a/parser/htmlparser/src/CNavDTD.h +++ b/parser/htmlparser/src/CNavDTD.h @@ -172,7 +172,7 @@ private: */ PRBool CanPropagate(eHTMLTags aParent, eHTMLTags aChild, - PRBool aParentContains); + PRInt32 aParentContains); /** * This method gets called to determine whether a given @@ -186,7 +186,7 @@ private: */ PRBool CanOmit(eHTMLTags aParent, eHTMLTags aChild, - PRBool& aParentContains); + PRInt32& aParentContains); /** * Looking at aParent, try to see if we can propagate from aChild to