diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index dca93296ca8..1d4a42eabd7 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -38,20 +38,17 @@
 
 //#define ALLOW_TR_AS_CHILD_OF_TABLE  //by setting this to true, TR is allowable directly in TABLE.
 
-#define ENABLE_RESIDUALSTYLE  
-
-     
 #include "nsDebug.h"
 #include "nsIAtom.h"
-#include "CNavDTD.h" 
+#include "CNavDTD.h"
 #include "nsHTMLTokens.h"
 #include "nsCRT.h"
 #include "nsParser.h"
 #include "nsIParser.h"
-#include "nsIHTMLContentSink.h" 
+#include "nsIHTMLContentSink.h"
 #include "nsScanner.h"
-#include "prenv.h"  //this is here for debug reasons...
-#include "prtypes.h"  //this is here for debug reasons...
+#include "prenv.h"
+#include "prtypes.h"
 #include "prio.h"
 #include "plstr.h"
 #include "nsDTDUtils.h"
@@ -74,16 +71,11 @@
 /*
  * Ignore kFontStyle and kPhrase tags when the stack is deep, bug 58917.
  */
-#define FONTSTYLE_IGNORE_DEPTH (MAX_REFLOW_DEPTH*80/100)
-#define PHRASE_IGNORE_DEPTH    (MAX_REFLOW_DEPTH*90/100)
-  
+#define FONTSTYLE_IGNORE_DEPTH (MAX_REFLOW_DEPTH * 80 / 100)
+#define PHRASE_IGNORE_DEPTH    (MAX_REFLOW_DEPTH * 90 / 100)
 
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);                 
-static NS_DEFINE_IID(kIDTDIID,      NS_IDTD_IID);
-static NS_DEFINE_IID(kClassIID,     NS_INAVHTML_DTD_IID); 
+static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID);
 
-static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID); 
- 
 #ifdef DEBUG
 static const  char kNullToken[] = "Error: Null token given";
 static const  char kInvalidTagStackPos[] = "Error: invalid tag stack position";
@@ -93,22 +85,18 @@ static const  char kInvalidTagStackPos[] = "Error: invalid tag stack position";
 
 #ifdef MOZ_PERF_METRICS
 #  define START_TIMER()                    \
-    if(mParser) MOZ_TIMER_START(mParser->mParseTime); \
-    if(mParser) MOZ_TIMER_START(mParser->mDTDTime); 
+    if (mParser) MOZ_TIMER_START(mParser->mParseTime); \
+    if (mParser) MOZ_TIMER_START(mParser->mDTDTime); 
 
 #  define STOP_TIMER()                     \
-    if(mParser) MOZ_TIMER_STOP(mParser->mParseTime); \
-    if(mParser) MOZ_TIMER_STOP(mParser->mDTDTime); 
+    if (mParser) MOZ_TIMER_STOP(mParser->mParseTime); \
+    if (mParser) MOZ_TIMER_STOP(mParser->mDTDTime); 
 #else
 #  define STOP_TIMER() 
 #  define START_TIMER()
 #endif
 
-/************************************************************************
-  And now for the main class -- CNavDTD...
- ************************************************************************/
-
-
+// Some flags for use by the DTD.
 #define NS_DTD_FLAG_NONE                   0x00000000
 #define NS_DTD_FLAG_HAS_OPEN_HEAD          0x00000001
 #define NS_DTD_FLAG_HAS_OPEN_BODY          0x00000002
@@ -125,55 +113,15 @@ static const  char kInvalidTagStackPos[] = "Error: invalid tag stack position";
 #define NS_DTD_FLAG_HAS_MAIN_CONTAINER     (NS_DTD_FLAG_HAD_BODY |            \
                                             NS_DTD_FLAG_HAD_FRAMESET)
 
-/**
- *  This method gets called as part of our COM-like interfaces.
- *  Its purpose is to create an interface to parser object
- *  of some type.
- *  
- *  @update   gess 4/8/98
- *  @param    nsIID  id of object to discover
- *  @param    aInstancePtr ptr to newly discovered interface
- *  @return   NS_xxx result code
- */
-nsresult CNavDTD::QueryInterface(const nsIID& aIID, void** aInstancePtr)  
-{                                                                        
-  if (NULL == aInstancePtr) {                                            
-    return NS_ERROR_NULL_POINTER;                                        
-  }                                                                      
+NS_IMPL_ISUPPORTS2(CNavDTD, nsIDTD, CNavDTD);
 
-  if(aIID.Equals(kISupportsIID))    {  //do IUnknown...
-    *aInstancePtr = (nsIDTD*)(this);                                        
-  }
-  else if(aIID.Equals(kIDTDIID)) {  //do IParser base class...
-    *aInstancePtr = (nsIDTD*)(this);                                        
-  }
-  else if(aIID.Equals(kClassIID)) {  //do this class...
-    *aInstancePtr = (CNavDTD*)(this);                                        
-  }                 
-  else {
-    *aInstancePtr=0;
-    return NS_NOINTERFACE;
-  }
-  NS_ADDREF_THIS();
-  return NS_OK;                                                        
-}
-
-NS_IMPL_ADDREF(CNavDTD)
-NS_IMPL_RELEASE(CNavDTD)
-
-/**
- *  Default constructor
- *   
- *  @update  gess 4/9/98
- *  @param   
- *  @return  
- */
-CNavDTD::CNavDTD() : nsIDTD(), 
-    mMisplacedContent(0), 
+CNavDTD::CNavDTD()
+  : mMisplacedContent(0),
     mSink(0),
     mTokenAllocator(0),
+    mBodyContext(new nsDTDContext()),
     mTempContext(0),
-    mParser(0),       
+    mParser(0),
     mTokenizer(0),
     mDTDMode(eDTDMode_quirks),
     mDocType(eHTML3_Quirks), // why not eHTML_Quirks?
@@ -183,54 +131,44 @@ CNavDTD::CNavDTD() : nsIDTD(),
     mHeadContainerPosition(-1),
     mFlags(NS_DTD_FLAG_NONE)
 {
-  mBodyContext=new nsDTDContext();
 }
 
-/**
- * 
- * @update  gess1/8/99
- * @param 
- * @return
- */
-const nsIID& CNavDTD::GetMostDerivedIID(void)const {
+const nsIID&
+CNavDTD::GetMostDerivedIID() const
+{
+  static nsIID kClassIID = NS_GET_IID(CNavDTD);
   return kClassIID;
 }
 
 
 #ifdef NS_DEBUG
 
-nsLoggingSink* GetLoggingSink() {
+static nsLoggingSink*
+GetLoggingSink()
+{
+  // This returns a content sink that is useful for following what calls the DTD
+  // makes to the content sink.
 
-  //these are used when you want to generate a log file for contentsink construction...
+  static PRBool checkForPath = PR_TRUE;
+  static nsLoggingSink *theSink = nsnull;
+  static const char* gLogPath = nsnull; 
 
-  static  PRBool checkForPath=PR_TRUE;
-  static  nsLoggingSink *theSink=0;
-  static  const char* gLogPath=0; 
-
-  if(checkForPath) {
-    
-    // we're only going to check the environment once per session.
-
-    gLogPath = /* "c:/temp/parse.log"; */ PR_GetEnv("PARSE_LOGFILE"); 
-    checkForPath=PR_FALSE;
+  if (checkForPath) {
+    // Only check once per run.
+    gLogPath = PR_GetEnv("PARSE_LOGFILE"); 
+    checkForPath = PR_FALSE;
   }
   
 
-  if(gLogPath && (!theSink)) {
-    static  nsLoggingSink gLoggingSink;
+  if (gLogPath && !theSink) {
+    static nsLoggingSink gLoggingSink;
 
-    PRIntn theFlags = 0;
+    PRIntn theFlags = PR_CREATE_FILE | PR_RDWR;
 
-     // create the file exists, only open for read/write
-     // otherwise, create it
-    if(PR_Access(gLogPath,PR_ACCESS_EXISTS) != PR_SUCCESS)
-      theFlags = PR_CREATE_FILE;
-    theFlags |= PR_RDWR;
-
-     // open the record file
-    PRFileDesc *theLogFile = PR_Open(gLogPath,theFlags,0);
-    gLoggingSink.SetOutputStream(theLogFile,PR_TRUE);
-    theSink=&gLoggingSink;
+    // Open the record file.
+    PRFileDesc *theLogFile = PR_Open(gLogPath, theFlags, 0);
+    gLoggingSink.SetOutputStream(theLogFile, PR_TRUE);
+    theSink = &gLoggingSink;
   }
 
   return theSink;
@@ -238,29 +176,15 @@ nsLoggingSink* GetLoggingSink() {
  
 #endif
 
-/**
- *  Default destructor
- *  
- *  @update  gess 4/9/98
- *  @param   
- *  @return  
- */
-CNavDTD::~CNavDTD(){
-  if(mBodyContext) {
-    delete mBodyContext;
-    mBodyContext=0;
-  }
+CNavDTD::~CNavDTD()
+{
+  delete mBodyContext;
+  delete mTempContext;
 
-  if(mTempContext) {
-    delete mTempContext;
-    mTempContext=0;
-  }
-
-  
 #ifdef NS_DEBUG
-  if(mSink) {
-    nsLoggingSink *theLogSink=GetLoggingSink();
-    if(mSink==theLogSink) {
+  if (mSink) {
+    nsLoggingSink *theLogSink = GetLoggingSink();
+    if (mSink == theLogSink) {
       theLogSink->ReleaseProxySink();
     }
   }
@@ -268,16 +192,9 @@ CNavDTD::~CNavDTD(){
 
   NS_IF_RELEASE(mSink);
 }
- 
 
-/**
- * Call this method if you want the DTD to construct a fresh 
- * instance of itself. 
- * @update  gess 25May2000
- * @param 
- * @return
- */
-nsresult CNavDTD::CreateNewInstance(nsIDTD** aInstancePtrResult)
+nsresult
+CNavDTD::CreateNewInstance(nsIDTD** aInstancePtrResult)
 {
   nsresult result = NS_NewNavHTMLDTD(aInstancePtrResult);
   NS_ENSURE_SUCCESS(result, result);
@@ -291,17 +208,6 @@ nsresult CNavDTD::CreateNewInstance(nsIDTD** aInstancePtrResult)
   return result;
 }
 
-/**
- * This method is called to determine if the given DTD can parse
- * a document in a given source-type.
- * NOTE: Parsing always assumes that the end result will involve
- *       storing the result in the main content model.
- * @param aParserContext -- the context for this document (knows
- *           the content type, document type, parser command, etc).
- * @return eUnknownDetect if you don't know how to parse it,
- *         eValidDetect if you do, but someone may have a better idea,
- *         ePrimaryDetect if you think you know best
- */
 NS_IMETHODIMP_(eAutoDetectResult)
 CNavDTD::CanParse(CParserContext& aParserContext)
 {
@@ -322,22 +228,15 @@ CNavDTD::CanParse(CParserContext& aParserContext)
   return eUnknownDetect;
 }
 
-/**
-  * The parser uses a code sandwich to wrap the parsing process. Before
-  * the process begins, WillBuildModel() is called. Afterwards the parser
-  * calls DidBuildModel(). 
-  * @update	rickg 03.20.2000
-  * @param	aParserContext
-  * @param	aSink
-  * @return	error code (almost always 0)
-  */
-nsresult CNavDTD::WillBuildModel(const CParserContext& aParserContext,
-                                 nsITokenizer* aTokenizer,
-                                 nsIContentSink* aSink) {
-  nsresult result=NS_OK;
+nsresult
+CNavDTD::WillBuildModel(const CParserContext& aParserContext,
+                        nsITokenizer* aTokenizer,
+                        nsIContentSink* aSink)
+{
+  nsresult result = NS_OK;
 
-  mFilename=aParserContext.mScanner->GetFilename();
-  mFlags = NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE; // residual style is always on. This will also reset the flags
+  mFilename = aParserContext.mScanner->GetFilename();
+  mFlags = NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE;
   mLineNumber = 1;
   mDTDMode = aParserContext.mDTDMode;
   mParserCommand = aParserContext.mParserCommand;
@@ -346,8 +245,7 @@ nsresult CNavDTD::WillBuildModel(const CParserContext& aParserContext,
   mTokenizer = aTokenizer;
   mBodyContext->SetNodeAllocator(&mNodeAllocator);
 
-  if(!aParserContext.mPrevContext && aSink) {
-
+  if (!aParserContext.mPrevContext && aSink) {
     STOP_TIMER();
     MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::WillBuildModel(), this=%p\n", this));
     
@@ -364,26 +262,26 @@ nsresult CNavDTD::WillBuildModel(const CParserContext& aParserContext,
       }
     }
     
-    //let's see if the environment is set up for us to write output to
-    //a logging sink. If so, then we'll create one, and make it the
-    //proxy for the real sink we're given from the parser.
+    // Let's see if the environment is set up for us to write output to
+    // a logging sink. If so, then we'll create one, and make it the
+    // proxy for the real sink we're given from the parser.
 #ifdef NS_DEBUG
-    nsLoggingSink *theLogSink=GetLoggingSink();
-    if(theLogSink) {   
+    nsLoggingSink *theLogSink = GetLoggingSink();
+    if (theLogSink) {
       theLogSink->SetProxySink(mSink);
-      mSink=theLogSink;
+      mSink = theLogSink;
     }
 #endif    
 
-   if(mSink) {
+   if (mSink) {
       PRBool enabled = PR_TRUE;
       mSink->IsEnabled(eHTMLTag_frameset, &enabled);
-      if(enabled) {
+      if (enabled) {
         mFlags |= NS_IPARSER_FLAG_FRAMES_ENABLED;
       }
       
       mSink->IsEnabled(eHTMLTag_script, &enabled);
-      if(enabled) {
+      if (enabled) {
         mFlags |= NS_IPARSER_FLAG_SCRIPT_ENABLED;
       }
     }
@@ -392,114 +290,117 @@ nsresult CNavDTD::WillBuildModel(const CParserContext& aParserContext,
   return result;
 }
 
-
-/**
-  * This is called when it's time to read as many tokens from the tokenizer
-  * as you can. Not all tokens may make sense, so you may not be able to
-  * read them all (until more come in later).
-  *
-  * @update gess5/18/98
-  * @param  aParser is the parser object that's driving this process
-  * @return error code (almost always NS_OK)
-  */
-nsresult CNavDTD::BuildModel(nsIParser* aParser,nsITokenizer* aTokenizer,nsITokenObserver* anObserver,nsIContentSink* aSink) {
-  NS_PRECONDITION(mBodyContext!=nsnull,"Create a context before calling build model");
+nsresult
+CNavDTD::BuildModel(nsIParser* aParser,
+                    nsITokenizer* aTokenizer,
+                    nsITokenObserver* anObserver,
+                    nsIContentSink* aSink)
+{
+  NS_PRECONDITION(mBodyContext != nsnull,
+                  "Create a context before calling build model");
 
   nsresult result = NS_OK;
 
-  if (aTokenizer && aParser) {
-    nsITokenizer*  oldTokenizer = mTokenizer;
+  if (!aTokenizer || !aParser) {
+    return NS_OK;
+  }
 
-    mTokenizer      = aTokenizer;
-    mParser         = (nsParser*)aParser;
-    mTokenAllocator = mTokenizer->GetTokenAllocator();
-    
-    if (mSink) {
-      if (mBodyContext->GetCount() == 0) {
-        CStartToken* theToken=nsnull;
-        if(ePlainText==mDocType) {
-          //we do this little trick for text files, in both normal and viewsource mode...
-          theToken=NS_STATIC_CAST(CStartToken*,mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_pre));
-          if(theToken) {
-            mTokenizer->PushTokenFront(theToken);
-          }
-        }
+  nsITokenizer*  oldTokenizer = mTokenizer;
 
-        // always open a body if frames are disabled....
-        if(!(mFlags & NS_IPARSER_FLAG_FRAMES_ENABLED)) {
-          theToken=NS_STATIC_CAST(CStartToken*,mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_body,NS_LITERAL_STRING("body")));
-          mTokenizer->PushTokenFront(theToken);
-        }
-          //if the content model is empty, then begin by opening <html>...
-        theToken = (CStartToken*)mTokenizer->GetTokenAt(0);
-        if (theToken) {
-          eHTMLTags theTag = (eHTMLTags)theToken->GetTypeID();
-          eHTMLTokenTypes theType = eHTMLTokenTypes(theToken->GetTokenType());
-          if (theTag != eHTMLTag_html || theType != eToken_start) {
-            theToken = NS_STATIC_CAST(CStartToken*,mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_html,NS_LITERAL_STRING("html")));          	
-            if (theToken) {
-              mTokenizer->PushTokenFront(theToken); //this token should get pushed on the context stack.
-            }
-          }
-        }
-        else {
-          theToken = NS_STATIC_CAST(CStartToken*,mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_html,NS_LITERAL_STRING("html")));
-          if (theToken) {
-            mTokenizer->PushTokenFront(theToken); //this token should get pushed on the context stack.
-          }
+  mTokenizer      = aTokenizer;
+  mParser         = (nsParser*)aParser;
+  mTokenAllocator = mTokenizer->GetTokenAllocator();
+  
+  if (!mSink) {
+    return (mFlags & NS_DTD_FLAG_STOP_PARSING)
+           ? NS_ERROR_HTMLPARSER_STOPPARSING
+           : result;
+  }
+
+  if (mBodyContext->GetCount() == 0) {
+    CToken* tempToken;
+    if (ePlainText == mDocType) {
+      tempToken =
+        mTokenAllocator->CreateTokenOfType(eToken_start, eHTMLTag_pre);
+      if (tempToken) {
+        mTokenizer->PushTokenFront(tempToken);
+      }
+    }
+
+    // Always open a body if frames are disabled.
+    if (!(mFlags & NS_IPARSER_FLAG_FRAMES_ENABLED)) {
+      tempToken =
+        mTokenAllocator->CreateTokenOfType(eToken_start,
+                                           eHTMLTag_body,
+                                           NS_LITERAL_STRING("body"));
+      if (tempToken) {
+        mTokenizer->PushTokenFront(tempToken);
+      }
+    }
+
+    // If the content model is empty, then begin by opening <html>.
+    CStartToken* theToken = (CStartToken*)mTokenizer->GetTokenAt(0);
+    if (theToken) {
+      eHTMLTags theTag = (eHTMLTags)theToken->GetTypeID();
+      eHTMLTokenTypes theType = eHTMLTokenTypes(theToken->GetTokenType());
+      if (theTag != eHTMLTag_html || theType != eToken_start) {
+        tempToken =
+          mTokenAllocator->CreateTokenOfType(eToken_start,
+                                             eHTMLTag_html,
+                                             NS_LITERAL_STRING("html"));
+        if (tempToken) {
+          mTokenizer->PushTokenFront(tempToken);
         }
       }
-    
-      mSink->WillProcessTokens();
-
-      while (NS_SUCCEEDED(result)) {
-        if (!(mFlags & NS_DTD_FLAG_STOP_PARSING)) {
-          CToken* theToken = mTokenizer->PopToken();
-          if (theToken) { 
-            result = HandleToken(theToken,aParser);
-          }
-          else break;
-        }
-        else {
-          result = NS_ERROR_HTMLPARSER_STOPPARSING;
-          break;
-        }
-
-        if ((NS_ERROR_HTMLPARSER_INTERRUPTED == mSink->DidProcessAToken())) {
-          // The content sink has requested that DTD interrupt processing tokens
-          // So we need to make sure the parser is in a state where it can be
-          // interrupted. 
-          // The mParser->CanInterrupt will return TRUE if BuildModel was called
-          // from a place in the parser where it prepared to handle a return value of
-          // NS_ERROR_HTMLPARSER_INTERRUPTED.
-          // If the parser is processing a script's document.write we should not
-          // allow it to be interrupted.
-          // We also need to make sure that an interruption does not override
-          // a request to block the parser.
-          if (mParser->CanInterrupt() && 
-              !IsParserInDocWrite() && 
-              NS_SUCCEEDED(result)) {
-            result = NS_ERROR_HTMLPARSER_INTERRUPTED;
-            break;
-          }
-        }
-      }//while
-      mTokenizer = oldTokenizer;
-    }
-    else {
-      result = mFlags & NS_DTD_FLAG_STOP_PARSING ? NS_ERROR_HTMLPARSER_STOPPARSING : result;
+    } else {
+      tempToken =
+        mTokenAllocator->CreateTokenOfType(eToken_start,
+                                           eHTMLTag_html,
+                                           NS_LITERAL_STRING("html"));
+      if (tempToken) {
+        mTokenizer->PushTokenFront(tempToken);
+      }
     }
   }
 
+  mSink->WillProcessTokens();
+
+  while (NS_SUCCEEDED(result)) {
+    if (!(mFlags & NS_DTD_FLAG_STOP_PARSING)) {
+      CToken* theToken = mTokenizer->PopToken();
+      if (!theToken) {
+        break;
+      }
+      result = HandleToken(theToken, aParser);
+    } else {
+      result = NS_ERROR_HTMLPARSER_STOPPARSING;
+      break;
+    }
+
+    if (NS_ERROR_HTMLPARSER_INTERRUPTED == mSink->DidProcessAToken()) {
+      // The content sink has requested that DTD interrupt processing tokens
+      // So we need to make sure the parser is in a state where it can be
+      // interrupted. 
+      // The mParser->CanInterrupt will return TRUE if BuildModel was called
+      // from a place in the parser where it prepared to handle a return value of
+      // NS_ERROR_HTMLPARSER_INTERRUPTED.
+      // If the parser is processing a script's document.write we should not
+      // allow it to be interrupted.
+      // We also need to make sure that an interruption does not override
+      // a request to block the parser.
+      if (mParser->CanInterrupt() && 
+          !IsParserInDocWrite() && 
+          NS_SUCCEEDED(result)) {
+        result = NS_ERROR_HTMLPARSER_INTERRUPTED;
+        break;
+      }
+    }
+  }
+
+  mTokenizer = oldTokenizer;
   return result;
 }
 
-/**
- * @param aTarget - Tag that was neglected in the document.
- * @param aType   - Specifies the type of the target. Ex. start, end, text, etc.
- * @param aParser - Parser to drive this process
- * @param aSink   - HTML Content sink
- */
 nsresult
 CNavDTD::BuildNeglectedTarget(eHTMLTags aTarget,
                               eHTMLTokenTypes aType,
@@ -508,35 +409,35 @@ CNavDTD::BuildNeglectedTarget(eHTMLTags aTarget,
 { 
   NS_ASSERTION(mTokenizer, "tokenizer is null! unable to build target.");
   NS_ASSERTION(mTokenAllocator, "unable to create tokens without an allocator.");
-  if (!mTokenizer || !mTokenAllocator)
+  if (!mTokenizer || !mTokenAllocator) {
     return NS_OK;
-  CHTMLToken* target = 
-      NS_STATIC_CAST(CHTMLToken*, mTokenAllocator->CreateTokenOfType(aType, aTarget));
+  }
+
+  CToken* target = mTokenAllocator->CreateTokenOfType(aType, aTarget);
   mTokenizer->PushTokenFront(target);
   return BuildModel(aParser, mTokenizer, 0, aSink);
 }
 
-/**
- * 
- * @update  gess5/18/98
- * @param 
- * @return 
- */
-nsresult CNavDTD::DidBuildModel(nsresult anErrorCode,
-                                PRBool aNotifySink,
-                                nsIParser* aParser,
-                                nsIContentSink* aSink)
+nsresult
+CNavDTD::DidBuildModel(nsresult anErrorCode,
+                       PRBool aNotifySink,
+                       nsIParser* aParser,
+                       nsIContentSink* aSink)
 {
-  if (!aSink)
+  if (!aSink) {
     return NS_OK;
+  }
+
   nsresult result = NS_OK;
-  if (aParser && aNotifySink) { 
+  if (aParser && aNotifySink) {
     if (NS_OK == anErrorCode) {
       if (!(mFlags & NS_DTD_FLAG_HAS_MAIN_CONTAINER)) {
         // This document is not a frameset document, however, it did not contain
         // a body tag either. So, make one!. Note: Body tag is optional per spec..
-        result = BuildNeglectedTarget(eHTMLTag_body, eToken_start, aParser, aSink);
-        NS_ENSURE_SUCCESS(result , result);
+        // Also note: We ignore the return value of BuildNeglectedTarget, we
+        // can't reasonably respond to errors (or requests to block) at this
+        // point in the parsing process.
+        BuildNeglectedTarget(eHTMLTag_body, eToken_start, aParser, aSink);
       }
       if (mFlags & NS_DTD_FLAG_MISPLACED_CONTENT) {
         // Looks like the misplaced contents are not processed yet.
@@ -562,8 +463,10 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode,
         } while (mFlags & NS_DTD_FLAG_MISPLACED_CONTENT);
 
         mBodyContext->mContextTopIndex = -1; 
-      }          
-      //now let's disable style handling to save time when closing remaining stack members...
+      }
+
+      // Now let's disable style handling to save time when closing remaining
+      // stack members.
       mFlags &= ~NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE;
       while (mBodyContext->GetCount() > 0) { 
         result = CloseContainersTo(mBodyContext->Last(), PR_FALSE);
@@ -573,28 +476,27 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode,
           return result;
         }
       } 
-    } 
-    else {
-      //If you're here, then an error occured, but we still have nodes on the stack.
-      //At a minimum, we should grab the nodes and recycle them.
-      //Just to be correct, we'll also recycle the nodes.
+    } else {
+      // If you're here, then an error occured, but we still have nodes on the stack.
+      // At a minimum, we should grab the nodes and recycle them.
+      // Just to be correct, we'll also recycle the nodes.
       while (mBodyContext->GetCount() > 0) { 
         nsEntryStack* theChildStyles = 0;
         nsCParserNode* theNode = mBodyContext->Pop(theChildStyles);
-        IF_DELETE(theChildStyles,&mNodeAllocator);
+        IF_DELETE(theChildStyles, &mNodeAllocator);
         IF_FREE(theNode, &mNodeAllocator);
       } 
     }
 
-    //Now make sure the misplaced content list is empty,
-    //by forcefully recycling any tokens we might find there.
+    // Now make sure the misplaced content list is empty,
+    // by forcefully recycling any tokens we might find there.
     CToken* theToken = 0;
     while ((theToken = (CToken*)mMisplacedContent.Pop())) {
       IF_FREE(theToken, mTokenAllocator);
     }
-  } //if aparser
+  }
 
-  //No matter what, you need to call did build model.
+  // No matter what, you need to call did build model.
   return aSink->DidBuildModel(); 
 }
 
@@ -612,38 +514,41 @@ CNavDTD::GetType()
 }
 
 /**
- * --- Backwards compatibility ---
- * Use this method to determine if the tag in question needs a BODY.
- * ---
+ * Text and some tags require a body when they're added, this function returns
+ * true for those tags.
+ *
+ * @param aToken The current token that we care about.
+ * @param aTokenizer A tokenizer that we can get the tags attributes off of.
+ * @return PR_TRUE if aToken does indeed force the body to open.
  */
-static 
-PRBool DoesRequireBody(CToken* aToken,nsITokenizer* aTokenizer) {
+static PRBool
+DoesRequireBody(CToken* aToken, nsITokenizer* aTokenizer)
+{
+  PRBool result = PR_FALSE;
 
-  PRBool result=PR_FALSE;
-
-  if(aToken) {
-    eHTMLTags theTag=(eHTMLTags)aToken->GetTypeID();
-    if(gHTMLElements[theTag].HasSpecialProperty(kRequiresBody)) {
-      if(theTag==eHTMLTag_input) {
+  if (aToken) {
+    eHTMLTags theTag = (eHTMLTags)aToken->GetTypeID();
+    if (gHTMLElements[theTag].HasSpecialProperty(kRequiresBody)) {
+      if (theTag == eHTMLTag_input) {
         // IE & Nav4x opens up a body for type=text - Bug 66985
-        PRInt32 ac=aToken->GetAttributeCount();
-        for(PRInt32 i=0; i<ac; ++i) {
-          CAttributeToken* attr=NS_STATIC_CAST(CAttributeToken*,aTokenizer->GetTokenAt(i));
-          const nsSubstring& name=attr->GetKey();
-          const nsAString& value=attr->GetValue();
+        PRInt32 ac = aToken->GetAttributeCount();
+        for(PRInt32 i = 0; i < ac; ++i) {
+          CAttributeToken* attr = NS_STATIC_CAST(CAttributeToken*,
+                                                 aTokenizer->GetTokenAt(i));
+          const nsSubstring& name = attr->GetKey();
+          const nsAString& value = attr->GetValue();
 
-          if((name.EqualsLiteral("type") || 
-              name.EqualsLiteral("TYPE"))    
-             && 
-             !(value.EqualsLiteral("hidden") || 
-             value.EqualsLiteral("HIDDEN"))) {
-            result=PR_TRUE; 
+          if ((name.EqualsLiteral("type") || 
+               name.EqualsLiteral("TYPE"))    
+              && 
+              !(value.EqualsLiteral("hidden") || 
+              value.EqualsLiteral("HIDDEN"))) {
+            result = PR_TRUE; 
             break;
           }
-        }//for
-      }
-      else {
-        result=PR_TRUE;
+        }
+      } else {
+        result = PR_TRUE;
       }
     }
   }
@@ -654,8 +559,9 @@ PRBool DoesRequireBody(CToken* aToken,nsITokenizer* aTokenizer) {
 /**
  * Returns whether or not there is a tag of type aType open on aContext.
  */
-static
-PRBool HasOpenTagOfType(PRInt32 aType, const nsDTDContext& aContext) {
+static PRBool
+HasOpenTagOfType(PRInt32 aType, const nsDTDContext& aContext)
+{
   PRInt32 count = aContext.GetCount();
 
   while (--count >= 0) {
@@ -667,342 +573,312 @@ PRBool HasOpenTagOfType(PRInt32 aType, const nsDTDContext& aContext) {
   return PR_FALSE;
 }
 
-/**
- *  This big dispatch method is used to route token handler calls to the right place.
- *  What's wrong with it? This table, and the dispatch methods themselves need to be 
- *  moved over to the delegate. Ah, so much to do...
- *  
- *  @update  gess 12/1/99
- *  @param   aToken 
- *  @param   aParser 
- *  @return  
- */
-nsresult CNavDTD::HandleToken(CToken* aToken,nsIParser* aParser){
-  nsresult  result=NS_OK;
+nsresult
+CNavDTD::HandleToken(CToken* aToken, nsIParser* aParser)
+{
+  if (!aToken) {
+    return NS_OK;
+  }
 
-  if(aToken) {
-    CHTMLToken*     theToken= NS_STATIC_CAST(CHTMLToken*, aToken);
-    eHTMLTokenTypes theType=eHTMLTokenTypes(theToken->GetTokenType());
-    eHTMLTags       theTag=(eHTMLTags)theToken->GetTypeID();
+  nsresult        result   = NS_OK;
+  CHTMLToken*     theToken = NS_STATIC_CAST(CHTMLToken*, aToken);
+  eHTMLTokenTypes theType  = eHTMLTokenTypes(theToken->GetTokenType());
+  eHTMLTags       theTag   = (eHTMLTags)theToken->GetTypeID();
 
-    aToken->SetLineNumber(mLineNumber);
+  aToken->SetLineNumber(mLineNumber);
 
-    if (!IsParserInDocWrite()) {
-      mLineNumber += aToken->GetNewlineCount();
+  if (!IsParserInDocWrite()) {
+    mLineNumber += aToken->GetNewlineCount();
+  }
+
+  if (mFlags & NS_DTD_FLAG_MISPLACED_CONTENT) {
+    // Included TD & TH to fix Bug# 20797
+    static eHTMLTags gLegalElements[] = {
+      eHTMLTag_table, eHTMLTag_thead, eHTMLTag_tbody,
+      eHTMLTag_tr, eHTMLTag_td, eHTMLTag_th, eHTMLTag_tfoot
+    };
+    // Don't even try processing misplaced tokens if we're already
+    // handling misplaced content. See bug 269095
+    if (mFlags & NS_DTD_FLAG_IN_MISPLACED_CONTENT) {
+      PushIntoMisplacedStack(theToken);
+      return NS_OK;
     }
-   
-    if(mFlags & NS_DTD_FLAG_MISPLACED_CONTENT) {
-      // Included TD & TH to fix Bug# 20797
-      static eHTMLTags gLegalElements[]={eHTMLTag_table,eHTMLTag_thead,eHTMLTag_tbody,
-                                         eHTMLTag_tr,eHTMLTag_td,eHTMLTag_th,eHTMLTag_tfoot};
-      if(theToken) {
-        // Don't even try processing misplaced tokens if we're already
-        // handling misplaced content. See bug 269095
-        if (mFlags & NS_DTD_FLAG_IN_MISPLACED_CONTENT) {
-          PushIntoMisplacedStack(theToken);
-          return result;  
-        }
 
-        eHTMLTags theParentTag=mBodyContext->Last();
-        theTag=(eHTMLTags)theToken->GetTypeID();
-        if(FindTagInSet(theTag, gLegalElements,
-                        NS_ARRAY_LENGTH(gLegalElements)) ||
-           (gHTMLElements[theParentTag].CanContain(theTag,mDTDMode) &&
-            // Here's a problem.  If theTag is legal in here, we don't move it
-            // out.  So if we're moving stuff out of here, the parent of theTag
-            // gets closed at this point.  But some things are legal
-            // _everywhere_ and hence would effectively close out misplaced
-            // content in tables.  This is undesirable, so treat them as
-            // illegal here so they'll be shipped out with their parents and
-            // siblings.  See bug 40855 for an explanation (that bug was for
-            // comments, but the same issues arise with whitespace, newlines,
-            // noscript, etc).  Script is special, though.  Shipping it out
-            // breaks document.write stuff.  See bug 243064.
-            (!gHTMLElements[theTag].HasSpecialProperty(kLegalOpen) ||
-             theTag == eHTMLTag_script))) {
-            
-          mFlags &= ~NS_DTD_FLAG_MISPLACED_CONTENT; // reset the state since all the misplaced tokens are about to get handled.
+    eHTMLTags theParentTag = mBodyContext->Last();
+    theTag = (eHTMLTags)theToken->GetTypeID();
+    if (FindTagInSet(theTag, gLegalElements,
+                     NS_ARRAY_LENGTH(gLegalElements)) ||
+        (gHTMLElements[theParentTag].CanContain(theTag, mDTDMode) &&
+         // Here's a problem.  If theTag is legal in here, we don't move it
+         // out.  So if we're moving stuff out of here, the parent of theTag
+         // gets closed at this point.  But some things are legal
+         // _everywhere_ and hence would effectively close out misplaced
+         // content in tables.  This is undesirable, so treat them as
+         // illegal here so they'll be shipped out with their parents and
+         // siblings.  See bug 40855 for an explanation (that bug was for
+         // comments, but the same issues arise with whitespace, newlines,
+         // noscript, etc).  Script is special, though.  Shipping it out
+         // breaks document.write stuff.  See bug 243064.
+         (!gHTMLElements[theTag].HasSpecialProperty(kLegalOpen) ||
+          theTag == eHTMLTag_script))) {
+      // Reset the state since all the misplaced tokens are about to get
+      // handled.
+      mFlags &= ~NS_DTD_FLAG_MISPLACED_CONTENT;
 
-          result = HandleSavedTokens(mBodyContext->mContextTopIndex);
-          NS_ENSURE_SUCCESS(result, result);
+      result = HandleSavedTokens(mBodyContext->mContextTopIndex);
+      NS_ENSURE_SUCCESS(result, result);
 
-          mBodyContext->mContextTopIndex = -1; 
-        }
-        else {
-          PushIntoMisplacedStack(theToken);
-          return result;
+      mBodyContext->mContextTopIndex = -1;
+    } else {
+      PushIntoMisplacedStack(theToken);
+      return result;
+    }
+  }
+
+  /*
+   * This section of code is used to "move" misplaced content from one location
+   * in our document model to another. (Consider what would happen if we found a
+   * <P> tag in the head.) To move content, we throw it onto the
+   * misplacedcontent deque until we can deal with it.
+   */
+  switch(theTag) {
+    case eHTMLTag_html:
+    case eHTMLTag_noframes:
+    case eHTMLTag_noscript:
+    case eHTMLTag_script:
+    case eHTMLTag_doctypeDecl:
+    case eHTMLTag_instruction:
+      break;
+
+    default:
+      if (!gHTMLElements[eHTMLTag_html].SectionContains(theTag, PR_FALSE)) {
+        if (!(mFlags & (NS_DTD_FLAG_HAS_MAIN_CONTAINER |
+                        NS_DTD_FLAG_ALTERNATE_CONTENT))) {
+          // For bug examples from this code, see bugs: 18928, 20989.
+          // At this point we know the body/frameset aren't open.
+          // If the child belongs in the head, then handle it (which may open the head);
+          // otherwise, push it onto the misplaced stack.
+
+          PRBool isExclusive = PR_FALSE;
+          PRBool theChildBelongsInHead =
+            gHTMLElements[eHTMLTag_head].IsChildOfHead(theTag, isExclusive);
+          if (theChildBelongsInHead && !isExclusive) {
+            if (mMisplacedContent.GetSize() == 0) {
+              // This tag can either be in the body or the head. Since
+              // there is no indication that the body should be open,
+              // put this token in the head.
+              break;
+            }
+
+            // Otherwise, we have received some indication that the body is
+            // "open", so push this token onto the misplaced content stack.
+            theChildBelongsInHead = PR_FALSE;
+          }
+
+          if (!theChildBelongsInHead) {
+            eHTMLTags top = mBodyContext->Last();
+            NS_ASSERTION(top != eHTMLTag_userdefined,
+                         "Userdefined tags should act as leaves in the head");
+            if (top != eHTMLTag_html &&
+                gHTMLElements[top].CanContain(theTag, mDTDMode)) {
+              // Some tags (such as <object> and <script>) are opened in the
+              // head and allow other non-head content to be children.
+              // Note: Userdefined tags in the head act like leaves.
+              break;
+            }
+
+            // If you're here then we found a child of the body that was out of
+            // place.  We're going to move it to the body by storing it
+            // temporarily on the misplaced stack.  However, in quirks mode, a
+            // few tags request, ambiguosly, for a BODY. - Bugs 18928, 24204.-
+            PushIntoMisplacedStack(aToken);
+
+            if (IsAlternateTag(theTag)) {
+              // These tags' contents are consumed as CDATA. If we simply
+              // pushed them on the misplaced content stack, the CDATA
+              // contents would force us to open a body, which could be
+              // wrong. So we collect the whole tag as misplaced in one
+              // gulp. Note that the tokenizer guarantees that there will
+              // be an end tag.
+              CToken *current = aToken;
+              while (current->GetTokenType() != eToken_end ||
+                     current->GetTypeID() != theTag) {
+                current = NS_STATIC_CAST(CToken *, mTokenizer->PopToken());
+                NS_ASSERTION(current, "The tokenizer is not creating good "
+                                      "alternate tags");
+                PushIntoMisplacedStack(current);
+              }
+
+              // XXX Add code to also collect incorrect attributes on the
+              // end tag.
+            }
+
+            if (DoesRequireBody(aToken, mTokenizer)) {
+              CToken* theBodyToken =
+                mTokenAllocator->CreateTokenOfType(eToken_start,
+                                                   eHTMLTag_body,
+                                                   NS_LITERAL_STRING("body"));
+              result = HandleToken(theBodyToken, aParser);
+            }
+            return result;
+          }
         }
       }
-    }
-  
-   
-    /* ---------------------------------------------------------------------------------
-       This section of code is used to "move" misplaced content from one location in 
-       our document model to another. (Consider what would happen if we found a <P> tag
-       and text in the head.) To move content, we throw it onto the misplacedcontent 
-       deque until we can deal with it.
-       ---------------------------------------------------------------------------------
-     */
-    switch(theTag) {
-      case eHTMLTag_html:
-      case eHTMLTag_noframes:
-      case eHTMLTag_noscript:
-      case eHTMLTag_script:
-      case eHTMLTag_doctypeDecl:
-      case eHTMLTag_instruction:
+  }
+
+  if (theToken) {
+    mParser = (nsParser*)aParser;
+
+    switch (theType) {
+      case eToken_text:
+      case eToken_start:
+      case eToken_whitespace:
+      case eToken_newline:
+        result = HandleStartToken(theToken);
+        break;
+
+      case eToken_end:
+        result = HandleEndToken(theToken);
+        break;
+
+      case eToken_cdatasection:
+      case eToken_comment:
+      case eToken_markupDecl:
+        result = HandleCommentToken(theToken);
+        break;
+
+      case eToken_entity:
+        result = HandleEntityToken(theToken);
+        break;
+
+      case eToken_attribute:
+        result = HandleAttributeToken(theToken);
+        break;
+
+      case eToken_instruction:
+        result = HandleProcessingInstructionToken(theToken);
+        break;
+
+      case eToken_doctypeDecl:
+        result = HandleDocTypeDeclToken(theToken);
         break;
 
       default:
-        if(!gHTMLElements[eHTMLTag_html].SectionContains(theTag,PR_FALSE)) {
-          if(!(mFlags & (NS_DTD_FLAG_HAS_MAIN_CONTAINER |
-                         NS_DTD_FLAG_ALTERNATE_CONTENT))) {
+        break;
+    }
 
-            //For bug examples from this code, see bugs: 18928, 20989.
-            //At this point we know the body/frameset aren't open. 
-            //If the child belongs in the head, then handle it (which may open the head);
-            //otherwise, push it onto the misplaced stack.
-
-            PRBool isExclusive=PR_FALSE;
-            PRBool theChildBelongsInHead=gHTMLElements[eHTMLTag_head].IsChildOfHead(theTag,isExclusive);
-            if(theChildBelongsInHead && !isExclusive) {
-              if (mMisplacedContent.GetSize() == 0) {
-                // This tag can either be in the body or the head. Since
-                // there is no indication that the body should be open,
-                // put this token in the head.
-                break;
-              }
-
-              // Otherwise, we have received some indication that the body is
-              // "open", so push this token onto the misplaced content stack.
-              theChildBelongsInHead = PR_FALSE;
-            }
-
-            if(!theChildBelongsInHead) {
-              eHTMLTags top = mBodyContext->Last();
-              NS_ASSERTION(top != eHTMLTag_userdefined,
-                           "Userdefined tags should act as leaves in the head");
-              if (top != eHTMLTag_html &&
-                  gHTMLElements[top].CanContain(theTag, mDTDMode)) {
-                // Some tags (such as <object> and <script>) are opened in the
-                // head and allow other non-head content to be children.
-                // Note: Userdefined tags in the head act like leaves.
-                break;
-              }
-
-              //If you're here then we found a child of the body that was out of place.
-              //We're going to move it to the body by storing it temporarily on the misplaced stack.
-              //However, in quirks mode, a few tags request, ambiguosly, for a BODY. - Bugs 18928, 24204.-
-              PushIntoMisplacedStack(aToken);
-              
-              if (IsAlternateTag(theTag)) {
-                // These tags' contents are consumed as CDATA. If we simply
-                // pushed them on the misplaced content stack, the CDATA
-                // contents would force us to open a body, which could be
-                // wrong. So we collect the whole tag as misplaced in one
-                // gulp. Note that the tokenizer guarantees that there will
-                // be an end tag.
-                CToken *current = aToken;
-                while (current->GetTokenType() != eToken_end ||
-                       current->GetTypeID() != theTag) {
-                  current = NS_STATIC_CAST(CToken *, mTokenizer->PopToken());
-                  NS_ASSERTION(current, "The tokenizer is not creating good "
-                                        "alternate tags");
-                  PushIntoMisplacedStack(current);
-                }
-
-                // XXX Add code to also collect incorrect attributes on the
-                // end tag.
-              }
-
-              if(DoesRequireBody(aToken,mTokenizer)) {
-                CToken* theBodyToken=NS_STATIC_CAST(CToken*,mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_body,NS_LITERAL_STRING("body")));
-                result=HandleToken(theBodyToken,aParser);
-              }
-              return result;
-            }
-          } //if
-        } //if
-    }//switch
-
-    if(theToken){
-      mParser=(nsParser*)aParser;
-
-      switch(theType) {
-        case eToken_text:
-        case eToken_start:
-        case eToken_whitespace: 
-        case eToken_newline:
-          result=HandleStartToken(theToken); break;
-
-        case eToken_end:
-          result=HandleEndToken(theToken); break;
-        
-        case eToken_cdatasection:
-        case eToken_comment:
-        case eToken_markupDecl:
-          result=HandleCommentToken(theToken); break;
-
-        case eToken_entity:
-          result=HandleEntityToken(theToken); break;
-
-        case eToken_attribute:
-          result=HandleAttributeToken(theToken); break;
-
-        case eToken_instruction:
-          result=HandleProcessingInstructionToken(theToken); break;
-
-        case eToken_doctypeDecl:
-          result=HandleDocTypeDeclToken(theToken); break;
-
-        default:
-          break;
-      }//switch
-
-      if(NS_SUCCEEDED(result) || (NS_ERROR_HTMLPARSER_BLOCK==result)) {
-         IF_FREE(theToken, mTokenAllocator);
-      }
-      else if(result==NS_ERROR_HTMLPARSER_STOPPARSING) {
-        mFlags |= NS_DTD_FLAG_STOP_PARSING;
-      }
-      else {
-        return NS_OK;
-      }
+    if (NS_SUCCEEDED(result) || NS_ERROR_HTMLPARSER_BLOCK == result) {
+       IF_FREE(theToken, mTokenAllocator);
+    } else if (result == NS_ERROR_HTMLPARSER_STOPPARSING) {
+      mFlags |= NS_DTD_FLAG_STOP_PARSING;
+    } else {
+      return NS_OK;
     }
   }
 
   return result;
 }
- 
-/**
- * This gets called after we've handled a given start tag.
- * It's a generic hook to let us to post processing.
- * @param   aToken contains the tag in question
- * @param   aChildTag is the tag itself.
- * @return  status
- */
-nsresult CNavDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){
-  nsresult result=NS_OK;
 
-  switch(aChildTag){
+nsresult
+CNavDTD::DidHandleStartTag(nsIParserNode& aNode, eHTMLTags aChildTag)
+{
+  nsresult result = NS_OK;
 
+  switch (aChildTag) {
     case eHTMLTag_pre:
     case eHTMLTag_listing:
       {
-        CToken* theNextToken=mTokenizer->PeekToken();
-        if(theNextToken)  {
-          eHTMLTokenTypes theType=eHTMLTokenTypes(theNextToken->GetTokenType());
-          if(eToken_newline==theType){
+        // Skip the 1st newline inside PRE and LISTING.
+
+        // XXX This code is incorrect in the face of misplaced <pre> and
+        // <listing> tags (as direct children of <table>).
+        CToken* theNextToken = mTokenizer->PeekToken();
+        if (theNextToken) {
+          eHTMLTokenTypes theType = eHTMLTokenTypes(theNextToken->GetTokenType());
+          if (eToken_newline == theType) {
             if (!IsParserInDocWrite()) {
               mLineNumber += theNextToken->GetNewlineCount();
             }
-            theNextToken=mTokenizer->PopToken();  //skip 1st newline inside PRE and LISTING
+            theNextToken = mTokenizer->PopToken();
             IF_FREE(theNextToken, mTokenAllocator); // fix for Bug 29379
-          }//if
-        }//if
+          }
+        }
       }
       break;
+
     default:
       break;
-  }//switch 
-
-  //handle <empty/> tags by generating a close tag...
-  //added this to fix bug 48351, which contains XHTML and uses empty tags.
-  nsCParserNode* theNode=NS_STATIC_CAST(nsCParserNode*,&aNode);
-  if(nsHTMLElement::IsContainer(aChildTag) && theNode && theNode->mToken) {  //nullptr test fixes bug 56085
-    CStartToken *theToken=NS_STATIC_CAST(CStartToken*,theNode->mToken);
-    if(theToken->IsEmpty()){
-
-      CToken *theEndToken=mTokenAllocator->CreateTokenOfType(eToken_end,aChildTag); 
-      if(theEndToken) {
-        result=HandleEndToken(theEndToken);
-        IF_FREE(theEndToken, mTokenAllocator);
-      }
-    }
   }
 
   return result;
-} 
- 
-/**
- *  Determine whether the given tag is open anywhere
- *  in our context stack.
- *  
- *  @update  gess 4/2/98
- *  @param   eHTMLTags tag to be searched for in stack
- *  @return  topmost index of tag on stack
- */
-PRInt32 CNavDTD::LastOf(eHTMLTags aTagSet[],PRInt32 aCount) const {
-  int theIndex=0;
-  for(theIndex=mBodyContext->GetCount()-1;theIndex>=0;theIndex--){
-    if(FindTagInSet((*mBodyContext)[theIndex],aTagSet,aCount)) { 
+}
+
+PRInt32
+CNavDTD::LastOf(eHTMLTags aTagSet[], PRInt32 aCount) const
+{
+  for (PRInt32 theIndex = mBodyContext->GetCount() - 1; theIndex >= 0;
+       --theIndex) {
+    if (FindTagInSet((*mBodyContext)[theIndex], aTagSet, aCount)) {
       return theIndex;
-    } 
-  } 
+    }
+  }
+
   return kNotFound;
 }
 
-/** 
- *  This method is called to determine whether or not the child
- *  tag is happy being OPENED in the context of the current
- *  tag stack. This is only called if the current parent thinks
- *  it wants to contain the given childtag.
- *    
- *  @param   aChildTag -- tag enum of child to be opened
- *  @param   aTagStack -- ref to current tag stack in DTD.
- *  @return  PR_TRUE if child agrees to be opened here.
- */  
-static
-PRBool CanBeContained(eHTMLTags aChildTag,nsDTDContext& aContext) {
-
+static PRBool
+CanBeContained(eHTMLTags aChildTag, nsDTDContext& aContext)
+{
   /* #    Interesting test cases:       Result:
    * 1.   <UL><LI>..<B>..<LI>           inner <LI> closes outer <LI>
    * 2.   <CENTER><DL><DT><A><CENTER>   allow nested <CENTER>
    * 3.   <TABLE><TR><TD><TABLE>...     allow nested <TABLE>
    * 4.   <FRAMESET> ... <FRAMESET>
    */
+  PRBool  result = PR_TRUE;
+  PRInt32 theCount = aContext.GetCount();
 
-  //Note: This method is going away. First we need to get the elementtable to do closures right, and
-  //      therefore we must get residual style handling to work.
+  if (0 < theCount) {
+    const TagList* theRootTags = gHTMLElements[aChildTag].GetRootTags();
+    const TagList* theSpecialParents =
+      gHTMLElements[aChildTag].GetSpecialParents();
 
-  //the changes to this method were added to fix bug 54651...
+    if (theRootTags) {
+      PRInt32 theRootIndex = LastOf(aContext, *theRootTags);
+      PRInt32 theSPIndex = theSpecialParents
+                           ? LastOf(aContext, *theSpecialParents)
+                           : kNotFound;
+      PRInt32 theChildIndex =
+        nsHTMLElement::GetIndexOfChildOrSynonym(aContext, aChildTag);
+      PRInt32 theTargetIndex = (theRootIndex > theSPIndex)
+                               ? theRootIndex
+                               : theSPIndex;
 
-  PRBool  result=PR_TRUE;
-  PRInt32 theCount=aContext.GetCount();
+      if (theTargetIndex == theCount-1 ||
+          (theTargetIndex == theChildIndex &&
+           gHTMLElements[aChildTag].CanContainSelf())) {
+        result = PR_TRUE;
+      } else {
+        result = PR_FALSE;
 
-  if(0<theCount){
-    const TagList* theRootTags=gHTMLElements[aChildTag].GetRootTags();
-    const TagList* theSpecialParents=gHTMLElements[aChildTag].GetSpecialParents();
-    if(theRootTags) {
-      PRInt32 theRootIndex=LastOf(aContext,*theRootTags);
-      PRInt32 theSPIndex=(theSpecialParents) ? LastOf(aContext,*theSpecialParents) : kNotFound;  
-      PRInt32 theChildIndex=nsHTMLElement::GetIndexOfChildOrSynonym(aContext,aChildTag);
-      PRInt32 theTargetIndex=(theRootIndex>theSPIndex) ? theRootIndex : theSPIndex;
+        static eHTMLTags gTableElements[] = { eHTMLTag_td, eHTMLTag_th };
 
-      if((theTargetIndex==theCount-1) ||
-        ((theTargetIndex==theChildIndex) && gHTMLElements[aChildTag].CanContainSelf())) {
-        result=PR_TRUE;
-      }
-      else {
-        
-        result=PR_FALSE;
-
-        static eHTMLTags gTableElements[]={eHTMLTag_td,eHTMLTag_th};
-
-        PRInt32 theIndex=theCount-1;
-        while(theChildIndex<theIndex) {
-          eHTMLTags theParentTag=aContext.TagAt(theIndex--);
-          if (gHTMLElements[theParentTag].IsMemberOf(kBlockEntity)  || 
-              gHTMLElements[theParentTag].IsMemberOf(kHeading)      || 
-              gHTMLElements[theParentTag].IsMemberOf(kPreformatted) || 
+        PRInt32 theIndex = theCount - 1;
+        while (theChildIndex < theIndex) {
+          eHTMLTags theParentTag = aContext.TagAt(theIndex--);
+          if (gHTMLElements[theParentTag].IsMemberOf(kBlockEntity)  ||
+              gHTMLElements[theParentTag].IsMemberOf(kHeading)      ||
+              gHTMLElements[theParentTag].IsMemberOf(kPreformatted) ||
               gHTMLElements[theParentTag].IsMemberOf(kFormControl)  ||  //fixes bug 44479
               gHTMLElements[theParentTag].IsMemberOf(kList)) {
-            if(!HasOptionalEndTag(theParentTag)) {
-              result=PR_TRUE;
+            if (!HasOptionalEndTag(theParentTag)) {
+              result = PR_TRUE;
               break;
             }
-          }
-          else if(FindTagInSet(theParentTag,gTableElements,sizeof(gTableElements)/sizeof(eHTMLTag_unknown))){
-            result=PR_TRUE;  //added this to catch a case we missed; bug 57173.
+          } else if (FindTagInSet(theParentTag, gTableElements,
+                                  NS_ARRAY_LENGTH(gTableElements))) {
+            // Added this to catch a case we missed; bug 57173.
+            result = PR_TRUE;
             break;
           }
         }
@@ -1011,182 +887,172 @@ PRBool CanBeContained(eHTMLTags aChildTag,nsDTDContext& aContext) {
   }
 
   return result;
-
 }
 
-enum eProcessRule {eNormalOp,eLetInlineContainBlock};
+enum eProcessRule { eNormalOp, eLetInlineContainBlock };
 
-/** 
- *  This method gets called when a start token has been 
- *  encountered in the parse process. If the current container
- *  can contain this tag, then add it. Otherwise, you have
- *  two choices: 1) create an implicit container for this tag
- *                  to be stored in
- *               2) close the top container, and add this to
- *                  whatever container ends up on top.
- *   
- *  @update  gess 3/25/98
- *  @param   aToken -- next (start) token to be handled
- *  @param   aNode -- CParserNode representing this start token
- *  @return  PR_TRUE if all went well; PR_FALSE if error occured
- */
-nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode *aNode) {
-  NS_PRECONDITION(0!=aToken,kNullToken);
+nsresult
+CNavDTD::HandleDefaultStartToken(CToken* aToken, eHTMLTags aChildTag,
+                                 nsCParserNode *aNode)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  nsresult  result=NS_OK;
-  PRBool  theChildIsContainer=nsHTMLElement::IsContainer(aChildTag);
+  nsresult  result = NS_OK;
+  PRBool  theChildIsContainer = nsHTMLElement::IsContainer(aChildTag);
 
-  // client of parser is spefically trying to parse a fragment that 
+  // Client of parser is spefically trying to parse a fragment that
   // may lack required context.  Suspend containment rules if so.
-  if (mParserCommand != eViewFragment)
-  {
-    PRBool  theChildAgrees=PR_TRUE;
-    PRInt32 theIndex=mBodyContext->GetCount();
-    PRBool  theParentContains=-1;
-    
-    do {
-   
-      eHTMLTags theParentTag=mBodyContext->TagAt(--theIndex);
-      theParentContains=CanContain(theParentTag,aChildTag);  //precompute containment, and pass it to CanOmit()...
+  if (mParserCommand != eViewFragment) {
+    PRBool  theChildAgrees = PR_TRUE;
+    PRInt32 theIndex = mBodyContext->GetCount();
+    PRBool  theParentContains = -1;
 
-      if(CanOmit(theParentTag,aChildTag,theParentContains)) {
-        result=HandleOmittedTag(aToken,aChildTag,theParentTag,aNode);
-        return result;
+    do {
+      eHTMLTags theParentTag = mBodyContext->TagAt(--theIndex);
+
+      // Precompute containment, and pass it to CanOmit()...
+      theParentContains = CanContain(theParentTag, aChildTag);
+      if (CanOmit(theParentTag, aChildTag, theParentContains)) {
+        HandleOmittedTag(aToken, aChildTag, theParentTag, aNode);
+        return NS_OK;
       }
 
-      eProcessRule theRule=eNormalOp; 
+      eProcessRule theRule = eNormalOp;
 
       if (!theParentContains &&
-          (IsBlockElement(aChildTag,theParentTag) &&
-           IsInlineElement(theParentTag,theParentTag))) { //broaden this to fix <inline><block></block></inline>
-        if (eHTMLTag_li != aChildTag) {  //remove test for table to fix 57554
-          nsCParserNode* theParentNode = NS_STATIC_CAST(nsCParserNode*, mBodyContext->PeekNode());
+          (IsBlockElement(aChildTag, theParentTag) &&
+           IsInlineElement(theParentTag, theParentTag))) {
+        // Don't test for table to fix 57554.
+        if (eHTMLTag_li != aChildTag) {
+          nsCParserNode* theParentNode = mBodyContext->PeekNode();
           if (theParentNode && theParentNode->mToken->IsWellFormed()) {
             theRule = eLetInlineContainBlock;
           }
         }
       }
 
-      switch(theRule){
-
-        case eNormalOp:        
-
-          theChildAgrees=PR_TRUE;
-          if(theParentContains) {
-
-            eHTMLTags theAncestor=gHTMLElements[aChildTag].mRequiredAncestor;
-            if(eHTMLTag_unknown!=theAncestor){
-              theChildAgrees=HasOpenContainer(theAncestor);
+      switch (theRule) {
+        case eNormalOp:
+          theChildAgrees = PR_TRUE;
+          if (theParentContains) {
+            eHTMLTags theAncestor = gHTMLElements[aChildTag].mRequiredAncestor;
+            if (eHTMLTag_unknown != theAncestor) {
+              theChildAgrees = HasOpenContainer(theAncestor);
             }
-            
-            if(theChildAgrees && theChildIsContainer) {
-              if(theParentTag!=aChildTag) {             
-                // Double check the power structure a
-                // Note: The bit is currently set on <A> and <LI>.
-                if(gHTMLElements[aChildTag].ShouldVerifyHierarchy()){
-                  PRInt32 theChildIndex=nsHTMLElement::GetIndexOfChildOrSynonym(*mBodyContext,aChildTag);
-              
-                  if((kNotFound<theChildIndex) && (theChildIndex<theIndex)) {
-                   
-                  /*-------------------------------------------------------------------------------------
-                     1  Here's a tricky case from bug 22596:  <h5><li><h5>
-                        How do we know that the 2nd <h5> should close the <LI> rather than nest inside the <LI>?
-                        (Afterall, the <h5> is a legal child of the <LI>).
-              
-                        The way you know is that there is no root between the two, so the <h5> binds more
-                        tightly to the 1st <h5> than to the <LI>.
-                     2.  Also, bug 6148 shows this case: <SPAN><DIV><SPAN>
-                        From this case we learned not to execute this logic if the parent is a block.
-                    
-                     3. Fix for 26583
-                        Ex. <A href=foo.html><B>foo<A href-bar.html>bar</A></B></A>  <-- A legal HTML
-                        In the above example clicking on "foo" or "bar" should link to
-                        foo.html or bar.html respectively. That is, the inner <A> should be informed
-                        about the presence of an open <A> above <B>..so that the inner <A> can close out
-                        the outer <A>. The following code does it for us.
-                     
-                     4. Fix for 27865 [ similer to 22596 ]. Ex: <DL><DD><LI>one<DD><LI>two
-                   -------------------------------------------------------------------------------------*/
-                     
-                    theChildAgrees=CanBeContained(aChildTag,*mBodyContext);
-                  } //if
-                }//if
-              } //if
-            } //if
-          } //if parentcontains
 
-          if(!(theParentContains && theChildAgrees)) {
-            if (!CanPropagate(theParentTag,aChildTag,theParentContains)) { 
-              if(theChildIsContainer || (!theParentContains)){ 
-                if(!theChildAgrees && 
-                   !gHTMLElements[aChildTag].CanAutoCloseTag(*mBodyContext,theIndex,aChildTag)) {
+            if (theChildAgrees && theChildIsContainer) {
+              if (theParentTag != aChildTag) {
+                // Double check the power structure
+                // Note: The bit is currently set on tags such as <A> and <LI>.
+                if (gHTMLElements[aChildTag].ShouldVerifyHierarchy()) {
+                  PRInt32 theChildIndex =
+                    nsHTMLElement::GetIndexOfChildOrSynonym(*mBodyContext,
+                                                            aChildTag);
+
+                  if (kNotFound < theChildIndex && theChildIndex < theIndex) {
+                    /*
+                     * 1  Here's a tricky case from bug 22596:  <h5><li><h5>
+                     *    How do we know that the 2nd <h5> should close the <LI>
+                     *    rather than nest inside the <LI>? (Afterall, the <h5>
+                     *    is a legal child of the <LI>).
+                     *
+                     *    The way you know is that there is no root between the
+                     *    two, so the <h5> binds more tightly to the 1st <h5>
+                     *    than to the <LI>.
+                     *
+                     * 2  Also, bug 6148 shows this case: <SPAN><DIV><SPAN>
+                     *    From this case we learned not to execute this logic if
+                     *    the parent is a block.
+                     *
+                     * 3  Fix for 26583:
+                     *    <A href=foo.html><B>foo<A href-bar.html>bar</A></B></A>
+                     *    In the above example clicking on "foo" or "bar" should
+                     *    link to foo.html or bar.html respectively. That is,
+                     *    the inner <A> should be informed about the presence of
+                     *    an open <A> above <B>..so that the inner <A> can close
+                     *    out the outer <A>. The following code does it for us.
+                     *
+                     * 4  Fix for 27865 [ similer to 22596 ]. Ex:
+                     *    <DL><DD><LI>one<DD><LI>two
+                     */
+                    theChildAgrees = CanBeContained(aChildTag, *mBodyContext);
+                  }
+                }
+              }
+            }
+          }
+
+          if (!(theParentContains && theChildAgrees)) {
+            if (!CanPropagate(theParentTag, aChildTag, theParentContains)) {
+              if (theChildIsContainer || !theParentContains) {
+                if (!theChildAgrees &&
+                    !gHTMLElements[aChildTag].CanAutoCloseTag(*mBodyContext,
+                                                              theIndex,
+                                                              aChildTag)) {
                   // Closing the tags above might cause non-compatible results.
-                  // Ex. <TABLE><TR><TD><TBODY>Text</TD></TR></TABLE>. 
-                  // In the example above <TBODY> is badly misplaced, but 
-                  // we should not attempt to close the tags above it, 
+                  // Ex. <TABLE><TR><TD><TBODY>Text</TD></TR></TABLE>.
+                  // In the example above <TBODY> is badly misplaced, but
+                  // we should not attempt to close the tags above it,
                   // The safest thing to do is to discard this tag.
+                  // XXX We get the above example wrong anyway because of
+                  // CanBeContained.
                   return result;
-                }
-                else if (mBodyContext->mContextTopIndex > 0 && theIndex <= mBodyContext->mContextTopIndex) {
-                  // Looks like the parent tag does not want to contain the current tag ( aChildTag ). 
-                  // However, we have to force the containment, when handling misplaced content, to avoid data loss.
-                  // Ref. bug 138577.
+                } else if (mBodyContext->mContextTopIndex > 0 &&
+                           theIndex <= mBodyContext->mContextTopIndex) {
+                  // Looks like the parent tag does not want to contain the
+                  // current tag ( aChildTag ).  However, we have to force the
+                  // containment, when handling misplaced content, to avoid data
+                  // loss.  Ref. bug 138577.
                   theParentContains = PR_TRUE;
+                } else {
+                  CloseContainersTo(theIndex, aChildTag, PR_TRUE);
                 }
-                else {
-                  CloseContainersTo(theIndex,aChildTag,PR_TRUE);
-                }
-              }//if
-              else break;
-            }//if
-            else {
+              } else {
+                break;
+              }
+            } else {
               CreateContextStackFor(aChildTag);
-              theIndex=mBodyContext->GetCount();
+              theIndex = mBodyContext->GetCount();
             }
-          }//if
+          }
           break;
 
         case eLetInlineContainBlock:
-          theParentContains=theChildAgrees=PR_TRUE; //cause us to fall out of loop and open the block.
+          // Break out of this loop and open the block.
+          theParentContains = theChildAgrees = PR_TRUE;
           break;
 
         default:
-          break;
+          NS_NOTREACHED("Invalid rule detected");
+      }
+    } while (!(theParentContains && theChildAgrees));
+  }
 
-      }//switch
-    } while(!(theParentContains && theChildAgrees));
-  }
-  
-  if(theChildIsContainer){
-    result=OpenContainer(aNode,aChildTag);
-  }
-  else {  //we're writing a leaf...
-    result=AddLeaf(aNode);
+  if (theChildIsContainer) {
+    result = OpenContainer(aNode, aChildTag);
+  } else {
+    result = AddLeaf(aNode);
   }
 
   return result;
 }
- 
-/**
- * This gets called before we've handled a given start tag.
- * It's a generic hook to let us do pre processing.
- * @param   aToken contains the tag in question
- * @param   aTag is the tag itself.
- * @param   aNode is the node (tag) with associated attributes.
- * @return  TRUE if tag processing should continue; FALSE if the tag has been handled.
- */
-nsresult CNavDTD::WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode& aNode) 
-{ 
+
+nsresult
+CNavDTD::WillHandleStartTag(CToken* aToken, eHTMLTags aTag,
+                            nsIParserNode& aNode)
+{
   nsresult result = NS_OK;
 
-  //this little gem creates a special attribute for the editor team to use.
-  //The attribute only get's applied to unknown tags, and is used by ender
-  //(during editing) to display a special icon for unknown tags.
-  if(eHTMLTag_userdefined == aTag) {
-    CAttributeToken* theToken= NS_STATIC_CAST(CAttributeToken*,mTokenAllocator->CreateTokenOfType(eToken_attribute,aTag));
-    if(theToken) {
+  // This little gem creates a special attribute for the editor team to use.
+  // The attribute only get's applied to unknown tags, and is used by ender
+  // (during editing) to display a special icon for unknown tags.
+  if (eHTMLTag_userdefined == aTag) {
+    CToken* tempToken = mTokenAllocator->CreateTokenOfType(eToken_attribute,
+                                                           aTag);
+    CAttributeToken* theToken = NS_STATIC_CAST(CAttributeToken*, tempToken);
+    if (theToken) {
       theToken->SetKey(NS_LITERAL_STRING("_moz-userdefined"));
-      aNode.AddAttribute(theToken);    
+      aNode.AddAttribute(theToken);
     }
   }
 
@@ -1203,15 +1069,13 @@ nsresult CNavDTD::WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode
     return kHierarchyTooDeep;
   }
 
-    /**************************************************************************************
-     *
-     * Now a little code to deal with bug #49687 (crash when layout stack gets too deep)
-     * I've also opened this up to any container (not just inlines): re bug 55095
-     * Improved to handle bug 55980 (infinite loop caused when DEPTH is exceeded and
-     * </P> is encountered by itself (<P>) is continuously produced.
-     *
-     **************************************************************************************/
-  
+  /*
+   * Now a little code to deal with bug #49687 (crash when layout stack gets
+   * too deep) I've also opened this up to any container (not just inlines):
+   * re bug 55095 Improved to handle bug 55980 (infinite loop caused when
+   * DEPTH is exceeded and </P> is encountered by itself (<P>) is continuously
+   * produced.
+   */
   if (stackDepth > MAX_REFLOW_DEPTH) {
     if (nsHTMLElement::IsContainer(aTag) &&
         !gHTMLElements[aTag].HasSpecialProperty(kHandleStrayTag)) {
@@ -1219,12 +1083,12 @@ nsresult CNavDTD::WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode
       // Instead of throwing away the current tag close it's parent
       // such that the stack level does not go beyond the max_reflow_depth.
       // This would allow leaf tags, that follow the current tag, to find
-      // the correct node. 
+      // the correct node.
       while (stackDepth != MAX_REFLOW_DEPTH && NS_SUCCEEDED(result)) {
-        result = CloseContainersTo(mBodyContext->Last(),PR_FALSE);
+        result = CloseContainersTo(mBodyContext->Last(), PR_FALSE);
         --stackDepth;
       }
-    }        
+    }
   }
 
   STOP_TIMER()
@@ -1240,254 +1104,275 @@ nsresult CNavDTD::WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode
   return result;
 }
 
-static void PushMisplacedAttributes(nsIParserNode& aNode,nsDeque& aDeque,PRInt32& aCount) {
-  if(aCount > 0) {
-    CToken* theAttrToken=nsnull;
-    nsCParserNode* theAttrNode = (nsCParserNode*)&aNode;
-    if(theAttrNode) {
-      while(aCount){ 
-        theAttrToken=theAttrNode->PopAttributeToken();
-        if(theAttrToken) {
-          theAttrToken->SetNewlineCount(0);
-          aDeque.Push(theAttrToken);
-        }
-        aCount--;
-      }//while
-    }//if
-  }//if
+static void
+PushMisplacedAttributes(nsIParserNode& aNode, nsDeque& aDeque, PRInt32& aCount)
+{
+  if (aCount <= 0) {
+    return;
+  }
+
+  nsCParserNode& theAttrNode = NS_STATIC_CAST(nsCParserNode &, aNode);
+  while (aCount) {
+    CToken* theAttrToken = theAttrNode.PopAttributeToken();
+    if (theAttrToken) {
+      theAttrToken->SetNewlineCount(0);
+      aDeque.Push(theAttrToken);
+    }
+    --aCount;
+  }
 }
 
-/** 
- *  This method gets called when a start token has been encountered that the parent
- *  wants to omit. 
- *   
- *  @update  gess 3/25/98
- *  @param   aToken -- next (start) token to be handled
- *  @param   aChildTag -- id of the child in question
- *  @param   aParent -- id of the parent in question
- *  @param   aNode -- CParserNode representing this start token
- *  @return  PR_TRUE if all went well; PR_FALSE if error occured
- */
-nsresult CNavDTD::HandleOmittedTag(CToken* aToken,eHTMLTags aChildTag,eHTMLTags aParent,nsIParserNode* aNode) {
-  NS_PRECONDITION(mBodyContext != nsnull,"need a context to work with");
+void
+CNavDTD::HandleOmittedTag(CToken* aToken, eHTMLTags aChildTag,
+                          eHTMLTags aParent, nsIParserNode* aNode)
+{
+  NS_PRECONDITION(mBodyContext != nsnull, "need a context to work with");
 
-  nsresult  result=NS_OK;
+  // The trick here is to see if the parent can contain the child, but prefers
+  // not to. Only if the parent CANNOT contain the child should we look to see
+  // if it's potentially a child of another section. If it is, the cache it for
+  // later.
+  PRInt32 theTagCount = mBodyContext->GetCount();
 
-  //The trick here is to see if the parent can contain the child, but prefers not to.
-  //Only if the parent CANNOT contain the child should we look to see if it's potentially a child
-  //of another section. If it is, the cache it for later.
-  //  1. Get the root node for the child. See if the ultimate node is the BODY, FRAMESET, HEAD or HTML
-  PRInt32   theTagCount = mBodyContext->GetCount();
+  // XXX This null check seems like it might be redundant.
+  if (aToken) {
+    PRInt32 attrCount = aToken->GetAttributeCount();
+    if (gHTMLElements[aParent].HasSpecialProperty(kBadContentWatch) &&
+        !nsHTMLElement::IsWhitespaceTag(aChildTag)) {
+      eHTMLTags theTag = eHTMLTag_unknown;
 
-  if(aToken) {
-    PRInt32   attrCount = aToken->GetAttributeCount();
-    if((gHTMLElements[aParent].HasSpecialProperty(kBadContentWatch)) &&
-       (!nsHTMLElement::IsWhitespaceTag(aChildTag))) {
-      eHTMLTags theTag=eHTMLTag_unknown;
-    
       // Determine the insertion point
-      while(theTagCount > 0) {
+      while (theTagCount > 0) {
         theTag = mBodyContext->TagAt(--theTagCount);
-        if(!gHTMLElements[theTag].HasSpecialProperty(kBadContentWatch)) {
-          mBodyContext->mContextTopIndex = theTagCount; // This is our insertion point
+        if (!gHTMLElements[theTag].HasSpecialProperty(kBadContentWatch)) {
+          // This is our insertion point.
+          mBodyContext->mContextTopIndex = theTagCount;
           break;
         }
       }
 
-      if(mBodyContext->mContextTopIndex>-1) {
-                  
-        PushIntoMisplacedStack(aToken);  
+      if (mBodyContext->mContextTopIndex > -1) {
+        PushIntoMisplacedStack(aToken);
+        // We're going to be using this token later.
+        IF_HOLD(aToken);
 
-        IF_HOLD(aToken);  // Hold on to this token for later use.
+        // If the token is attributed then save those attributes too.
+        if (attrCount > 0) {
+          PushMisplacedAttributes(*aNode, mMisplacedContent, attrCount);
+        }
 
-        // If the token is attributed then save those attributes too.    
-        if(attrCount > 0) PushMisplacedAttributes(*aNode,mMisplacedContent,attrCount);
+        // Remember that we've stashed some misplaced content.
+        mFlags |= NS_DTD_FLAG_MISPLACED_CONTENT;
+      }
+    }
 
-        mFlags |= NS_DTD_FLAG_MISPLACED_CONTENT; // This state would help us in gathering all the misplaced elements
-      }//if
-    }//if
-
-    if((aChildTag!=aParent) && (gHTMLElements[aParent].HasSpecialProperty(kSaveMisplaced))) {
-      
-      IF_HOLD(aToken);  // Hold on to this token for later use. Ref Bug. 53695
-      
+    if (aChildTag != aParent &&
+        gHTMLElements[aParent].HasSpecialProperty(kSaveMisplaced)) {
+      // Hold on to this token for later use. Ref Bug. 53695
+      IF_HOLD(aToken);
       PushIntoMisplacedStack(aToken);
+
       // If the token is attributed then save those attributes too.
-       if(attrCount > 0) PushMisplacedAttributes(*aNode,mMisplacedContent,attrCount);
+      if (attrCount > 0) {
+        PushMisplacedAttributes(*aNode, mMisplacedContent, attrCount);
+      }
     }
   }
-  return result;
 }
 
-/** 
+/**
  *  This method gets called when a kegen token is found.
  *   
  *  @update  harishd 05/02/00
  *  @param   aNode -- CParserNode representing keygen
  *  @return  NS_OK if all went well; ERROR if error occured
  */
-nsresult CNavDTD::HandleKeyGen(nsIParserNode* aNode) { 
-  nsresult result=NS_OK; 
+nsresult
+CNavDTD::HandleKeyGen(nsIParserNode* aNode)
+{
+  nsresult result = NS_OK;
 
-  if(aNode) { 
-  
-    nsCOMPtr<nsIFormProcessor> theFormProcessor = 
+  if (aNode) {
+    nsCOMPtr<nsIFormProcessor> theFormProcessor =
              do_GetService(kFormProcessorCID, &result);
-  
-    if(NS_SUCCEEDED(result)) { 
-      PRInt32      theAttrCount=aNode->GetAttributeCount(); 
-      nsVoidArray  theContent; 
-      nsAutoString theAttribute; 
-      nsAutoString theFormType; 
-      CToken*      theToken=nsnull; 
 
-      theFormType.AssignLiteral("select"); 
-  
-      result=theFormProcessor->ProvideContent(theFormType,theContent,theAttribute); 
+    if (NS_SUCCEEDED(result)) {
+      PRInt32      theAttrCount = aNode->GetAttributeCount();
+      nsVoidArray  theContent;
+      nsAutoString theAttribute;
+      nsAutoString theFormType;
+      CToken*      theToken = nsnull;
 
-      if(NS_SUCCEEDED(result)) {
-        nsString* theTextValue=nsnull; 
-        PRInt32   theIndex=nsnull; 
-  
-        if(mTokenizer && mTokenAllocator) {
-          // Populate the tokenizer with the fabricated elements in the reverse order 
-          // such that <SELECT> is on the top fo the tokenizer followed by <OPTION>s 
-          // and </SELECT> 
-          theToken=mTokenAllocator->CreateTokenOfType(eToken_end,eHTMLTag_select); 
-          mTokenizer->PushTokenFront(theToken); 
-  
-          for(theIndex=theContent.Count()-1;theIndex>-1;theIndex--) { 
-            theTextValue=(nsString*)theContent[theIndex]; 
-            theToken=mTokenAllocator->CreateTokenOfType(eToken_text,eHTMLTag_text,*theTextValue); 
-            mTokenizer->PushTokenFront(theToken); 
-            theToken=mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_option); 
-            mTokenizer->PushTokenFront(theToken); 
-          } 
-  
-          // The attribute ( provided by the form processor ) should be a part of the SELECT.
-          // Placing the attribute token on the tokenizer to get picked up by the SELECT.
-          theToken=mTokenAllocator->CreateTokenOfType(eToken_attribute,eHTMLTag_unknown,theAttribute);
+      theFormType.AssignLiteral("select");
 
-          ((CAttributeToken*)theToken)->SetKey(NS_LITERAL_STRING("_moz-type")); 
-          mTokenizer->PushTokenFront(theToken); 
-  
-          // Pop out NAME and CHALLENGE attributes ( from the keygen NODE ) 
-          // and place it in the tokenizer such that the attribtues get 
-          // sucked into SELECT node. 
-          for(theIndex=theAttrCount;theIndex>0;theIndex--) { 
-            mTokenizer->PushTokenFront(((nsCParserNode*)aNode)->PopAttributeToken()); 
-          } 
-  
-          theToken=mTokenAllocator->CreateTokenOfType(eToken_start,eHTMLTag_select); 
-          // Increament the count because of the additional attribute from the form processor.
-          theToken->SetAttributeCount(theAttrCount+1); 
-          mTokenizer->PushTokenFront(theToken); 
-        }//if(mTokenizer && mTokenAllocator)
-      }//if(NS_SUCCEEDED(result))
-    }// if(NS_SUCCEEDED(result)) 
-  } //if(aNode) 
-  return result; 
-} 
+      result = theFormProcessor->ProvideContent(theFormType, theContent,
+                                                theAttribute);
+      if (NS_SUCCEEDED(result)) {
+        nsString* theTextValue = nsnull;
+        PRInt32   theIndex = nsnull;
 
-PRBool CNavDTD::IsAlternateTag(eHTMLTags aTag) {
+        if (mTokenizer && mTokenAllocator) {
+          // Populate the tokenizer with the fabricated elements in the reverse
+          // order such that <SELECT> is on the top fo the tokenizer followed by
+          // <OPTION>s and </SELECT>.
+          theToken = mTokenAllocator->CreateTokenOfType(eToken_end,
+                                                        eHTMLTag_select);
+          if (!theToken) {
+            return NS_ERROR_OUT_OF_MEMORY;
+          }
+
+          mTokenizer->PushTokenFront(theToken);
+
+          for (theIndex = theContent.Count()-1; theIndex > -1; --theIndex) {
+            theTextValue = (nsString*)theContent[theIndex];
+            theToken = mTokenAllocator->CreateTokenOfType(eToken_text,
+                                                          eHTMLTag_text,
+                                                          *theTextValue);
+            if (!theToken) {
+              return NS_ERROR_OUT_OF_MEMORY;
+            }
+            mTokenizer->PushTokenFront(theToken);
+
+            theToken = mTokenAllocator->CreateTokenOfType(eToken_start,
+                                                          eHTMLTag_option);
+            if (!theToken) {
+              return NS_ERROR_OUT_OF_MEMORY;
+            }
+            mTokenizer->PushTokenFront(theToken);
+          }
+
+          // The attribute ( provided by the form processor ) should be a part
+          // of the SELECT.  Placing the attribute token on the tokenizer to get
+          // picked up by the SELECT.
+          theToken = mTokenAllocator->CreateTokenOfType(eToken_attribute,
+                                                        eHTMLTag_unknown,
+                                                        theAttribute);
+          if (!theToken) {
+            return NS_ERROR_OUT_OF_MEMORY;
+          }
+
+          ((CAttributeToken*)theToken)->SetKey(NS_LITERAL_STRING("_moz-type"));
+          mTokenizer->PushTokenFront(theToken);
+
+          // Pop out NAME and CHALLENGE attributes ( from the keygen NODE ) and
+          // place it in the tokenizer such that the attribtues get sucked into
+          // SELECT node.
+          for (theIndex = theAttrCount; theIndex > 0; --theIndex) {
+            mTokenizer->PushTokenFront(((nsCParserNode*)aNode)->PopAttributeToken());
+          }
+
+          theToken = mTokenAllocator->CreateTokenOfType(eToken_start,
+                                                        eHTMLTag_select);
+
+          // Increment the count because of the additional attribute from the form processor.
+          theToken->SetAttributeCount(theAttrCount + 1);
+          mTokenizer->PushTokenFront(theToken);
+        }
+      }
+    }
+  }
+  return result;
+}
+
+PRBool
+CNavDTD::IsAlternateTag(eHTMLTags aTag)
+{
   switch (aTag) {
     case eHTMLTag_noembed:
       return PR_TRUE;
+
     case eHTMLTag_noscript:
       return (mFlags & NS_IPARSER_FLAG_SCRIPT_ENABLED) != 0;
+
     case eHTMLTag_iframe:
     case eHTMLTag_noframes:
       return (mFlags & NS_IPARSER_FLAG_FRAMES_ENABLED) != 0;
+
     default:
       return PR_FALSE;
   }
 }
 
-/**
- *  This method gets called when a start token has been 
- *  encountered in the parse process. If the current container
- *  can contain this tag, then add it. Otherwise, you have
- *  two choices: 1) create an implicit container for this tag
- *                  to be stored in
- *               2) close the top container, and add this to
- *                  whatever container ends up on top.
- *  
- *  @update  gess 1/04/99
- *  @param   aToken -- next (start) token to be handled
- *  @param   aNode -- CParserNode representing this start token
- *  @return  PR_TRUE if all went well; PR_FALSE if error occured
- */      
-nsresult CNavDTD::HandleStartToken(CToken* aToken) {
-  NS_PRECONDITION(0!=aToken,kNullToken);
+nsresult
+CNavDTD::HandleStartToken(CToken* aToken)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  //Begin by gathering up attributes...
+  nsCParserNode* theNode = mNodeAllocator.CreateNode(aToken, mTokenAllocator);
 
-  nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken, mTokenAllocator);
-  
-  eHTMLTags     theChildTag=(eHTMLTags)aToken->GetTypeID();
-  PRInt16       attrCount=aToken->GetAttributeCount();
-  eHTMLTags     theParent=mBodyContext->Last();
-  nsresult      result=(0==attrCount) ? NS_OK : CollectAttributes(theNode,theChildTag,attrCount);
+  eHTMLTags     theChildTag = (eHTMLTags)aToken->GetTypeID();
+  PRInt16       attrCount   = aToken->GetAttributeCount();
+  eHTMLTags     theParent   = mBodyContext->Last();
+  nsresult      result      = NS_OK;
 
-  if(NS_OK==result) {
-    result=WillHandleStartTag(aToken,theChildTag,*theNode);
-    if(NS_OK==result) {
-      PRBool isTokenHandled =PR_FALSE;
-      PRBool theHeadIsParent=PR_FALSE;
+  if (attrCount > 0) {
+    result = CollectAttributes(theNode, theChildTag, attrCount);
+  }
 
-      if(nsHTMLElement::IsSectionTag(theChildTag)){
-        switch(theChildTag){
+  if (NS_OK == result) {
+    result = WillHandleStartTag(aToken, theChildTag, *theNode);
+    if (NS_OK == result) {
+      PRBool isTokenHandled = PR_FALSE;
+      PRBool theHeadIsParent = PR_FALSE;
+
+      if (nsHTMLElement::IsSectionTag(theChildTag)) {
+        switch (theChildTag) {
           case eHTMLTag_html:
-            if(mBodyContext->GetCount()>0) {
-              result=OpenContainer(theNode,theChildTag);
-              isTokenHandled=PR_TRUE;
+            if (mBodyContext->GetCount() > 0) {
+              result = OpenContainer(theNode, theChildTag);
+              isTokenHandled = PR_TRUE;
             }
             break;
+
           case eHTMLTag_body:
-            if(mFlags & NS_DTD_FLAG_HAS_OPEN_BODY) {
-              result=OpenContainer(theNode,theChildTag);
+            if (mFlags & NS_DTD_FLAG_HAS_OPEN_BODY) {
+              result = OpenContainer(theNode, theChildTag);
               isTokenHandled=PR_TRUE;
             }
             break;
+
           case eHTMLTag_head:
             mFlags |= NS_DTD_FLAG_HAS_EXPLICIT_HEAD;
 
             if (mFlags & NS_DTD_FLAG_HAS_MAIN_CONTAINER) {
-              result=HandleOmittedTag(aToken,theChildTag,theParent,theNode);
-              isTokenHandled=PR_TRUE;
+              HandleOmittedTag(aToken, theChildTag, theParent, theNode);
+              isTokenHandled = PR_TRUE;
             }
             break;
+
           default:
             break;
         }
       }
 
-      PRBool isExclusive=PR_FALSE;
-      theHeadIsParent=nsHTMLElement::IsChildOfHead(theChildTag,isExclusive);
-      
-      switch(theChildTag) {
+      PRBool isExclusive = PR_FALSE;
+      theHeadIsParent = nsHTMLElement::IsChildOfHead(theChildTag, isExclusive);
+
+      switch (theChildTag) {
         case eHTMLTag_area:
-          if(!mOpenMapCount) isTokenHandled=PR_TRUE;
+          if (!mOpenMapCount) {
+            isTokenHandled = PR_TRUE;
+          }
 
           STOP_TIMER();
           MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleStartToken(), this=%p\n", this));
-          
-          if (mOpenMapCount>0 && mSink) {
-            result=mSink->AddLeaf(*theNode);
-            isTokenHandled=PR_TRUE;
+
+          if (mOpenMapCount > 0 && mSink) {
+            result = mSink->AddLeaf(*theNode);
+            isTokenHandled = PR_TRUE;
           }
-          
+
           MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleStartToken(), this=%p\n", this));
           START_TIMER();
           break;
 
         case eHTMLTag_image:
-          aToken->SetTypeID(theChildTag=eHTMLTag_img);
+          aToken->SetTypeID(theChildTag = eHTMLTag_img);
           break;
 
         case eHTMLTag_keygen:
-          result=HandleKeyGen(theNode);
-          isTokenHandled=PR_TRUE;
+          result = HandleKeyGen(theNode);
+          isTokenHandled = PR_TRUE;
           break;
 
         case eHTMLTag_script:
@@ -1499,9 +1384,9 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
           break;
 
         default:;
-      }//switch
+      }
 
-      if(!isTokenHandled) {
+      if (!isTokenHandled) {
         PRBool prefersBody =
           gHTMLElements[theChildTag].HasSpecialProperty(kPreferBody);
 
@@ -1516,25 +1401,25 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
               (mFlags & NS_DTD_FLAG_HAS_OPEN_HEAD)
             : !(mFlags & NS_DTD_FLAG_HAS_MAIN_CONTAINER)));
 
-        if(theHeadIsParent) {
+        if (theHeadIsParent) {
           // These tokens prefer to be in the head.
           result = AddHeadContent(theNode);
-        }
-        else {
-          result = HandleDefaultStartToken(aToken,theChildTag,theNode); 
+        } else {
+          result = HandleDefaultStartToken(aToken, theChildTag, theNode);
         }
       }
 
-      //now do any post processing necessary on the tag...
-      if(NS_OK==result)
-        DidHandleStartTag(*theNode,theChildTag);
-    }//if
-  } //if
+      // Now do any post processing necessary on the tag...
+      if (NS_OK == result) {
+        DidHandleStartTag(*theNode, theChildTag);
+      }
+    }
+  }
 
-  if(kHierarchyTooDeep==result) {
-    //reset this error to ok; all that happens here is that given inline tag
-    //gets dropped because the stack is too deep. Don't terminate parsing.
-    result=NS_OK;
+  if (kHierarchyTooDeep == result) {
+    // Reset this error to ok; all that happens here is that given inline tag
+    // gets dropped because the stack is too deep. Don't terminate parsing.
+    result = NS_OK;
   }
 
   IF_FREE(theNode, &mNodeAllocator);
@@ -1544,29 +1429,31 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
 /**
  *  Call this to see if you have a closeable peer on the stack that
  *  is ABOVE one of its root tags.
- *   
+ *
  *  @update  gess 4/11/99
  *  @param   aRootTagList -- list of root tags for aTag
  *  @param   aTag -- tag to test for containership
  *  @return  PR_TRUE if given tag can contain other tags
  */
-static
-PRBool HasCloseablePeerAboveRoot(const TagList& aRootTagList,nsDTDContext& aContext,eHTMLTags aTag,PRBool anEndTag) {
-  PRInt32   theRootIndex=LastOf(aContext,aRootTagList);  
-  const TagList*  theCloseTags=(anEndTag) ? gHTMLElements[aTag].GetAutoCloseEndTags() : gHTMLElements[aTag].GetAutoCloseStartTags();
-  PRInt32 theChildIndex=-1;
+static PRBool
+HasCloseablePeerAboveRoot(const TagList& aRootTagList, nsDTDContext& aContext,
+                          eHTMLTags aTag, PRBool anEndTag)
+{
+  PRInt32  theRootIndex = LastOf(aContext, aRootTagList);
+  const TagList* theCloseTags = anEndTag
+                                ? gHTMLElements[aTag].GetAutoCloseEndTags()
+                                : gHTMLElements[aTag].GetAutoCloseStartTags();
+  PRInt32 theChildIndex = -1;
 
-  if(theCloseTags) {
-    theChildIndex=LastOf(aContext,*theCloseTags);
+  if (theCloseTags) {
+    theChildIndex=LastOf(aContext, *theCloseTags);
+  } else if (anEndTag || !gHTMLElements[aTag].CanContainSelf()) {
+    theChildIndex = aContext.LastOf(aTag);
   }
-  else {
-    if((anEndTag) || (!gHTMLElements[aTag].CanContainSelf()))
-      theChildIndex=aContext.LastOf(aTag);
-  }
-    // I changed this to theRootIndex<=theChildIndex so to handle this case:
-    //  <SELECT><OPTGROUP>...</OPTGROUP>
-    //
-  return PRBool(theRootIndex<=theChildIndex);  
+
+  // I changed this to theRootIndex<=theChildIndex so to handle this case:
+  //  <SELECT><OPTGROUP>...</OPTGROUP>
+  return theRootIndex<=theChildIndex;
 }
 
 
@@ -1575,103 +1462,120 @@ PRBool HasCloseablePeerAboveRoot(const TagList& aRootTagList,nsDTDContext& aCont
  *  can be autoclosed. This means that based on the current
  *  context, the stack should be closed to the nearest matching
  *  tag.
- *     
+ *
  *  @param   aTag -- tag enum of child to be tested
  *  @return  PR_TRUE if autoclosure should occur
- */ 
-static
-eHTMLTags FindAutoCloseTargetForEndTag(eHTMLTags aCurrentTag,nsDTDContext& aContext,nsDTDMode aMode) {
-  int theTopIndex=aContext.GetCount();
-  eHTMLTags thePrevTag=aContext.Last();
- 
-  if(nsHTMLElement::IsContainer(aCurrentTag)){
-    PRInt32 theChildIndex=nsHTMLElement::GetIndexOfChildOrSynonym(aContext,aCurrentTag);
-    
-    if(kNotFound<theChildIndex) {
-      if(thePrevTag==aContext[theChildIndex]){
+ */
+static eHTMLTags
+FindAutoCloseTargetForEndTag(eHTMLTags aCurrentTag, nsDTDContext& aContext,
+                             nsDTDMode aMode)
+{
+  int theTopIndex = aContext.GetCount();
+  eHTMLTags thePrevTag = aContext.Last();
+
+  if (nsHTMLElement::IsContainer(aCurrentTag)) {
+    PRInt32 theChildIndex =
+      nsHTMLElement::GetIndexOfChildOrSynonym(aContext, aCurrentTag);
+
+    if (kNotFound < theChildIndex) {
+      if (thePrevTag == aContext[theChildIndex]) {
         return aContext[theChildIndex];
-      } 
-    
-      if(nsHTMLElement::IsBlockCloser(aCurrentTag)) {
-
-          /*here's what to do: 
-              Our here is sitting at aChildIndex. There are other tags above it
-              on the stack. We have to try to close them out, but we may encounter
-              one that can block us. The way to tell is by comparing each tag on
-              the stack against our closeTag and rootTag list. 
-
-              For each tag above our hero on the stack, ask 3 questions:
-                1. Is it in the closeTag list? If so, the we can skip over it
-                2. Is it in the rootTag list? If so, then we're gated by it
-                3. Otherwise its non-specified and we simply presume we can close it.
-          */
- 
-        const TagList* theCloseTags=gHTMLElements[aCurrentTag].GetAutoCloseEndTags();
-        const TagList* theRootTags=gHTMLElements[aCurrentTag].GetEndRootTags();
-      
-        if(theCloseTags){  
-            //at a min., this code is needed for H1..H6
-        
-          while(theChildIndex<--theTopIndex) {
-            eHTMLTags theNextTag=aContext[theTopIndex];
-            if(PR_FALSE==FindTagInSet(theNextTag,theCloseTags->mTags,theCloseTags->mCount)) {
-              if(PR_TRUE==FindTagInSet(theNextTag,theRootTags->mTags,theRootTags->mCount)) {
-                return eHTMLTag_unknown; //we encountered a tag in root list so fail (because we're gated).
-              }
-              //otherwise presume it's something we can simply ignore and continue search...
-            }
-            //otherwise its in the close list so skip to next tag...
-          } 
-          eHTMLTags theTarget=aContext.TagAt(theChildIndex);
-          if(aCurrentTag!=theTarget) {
-            aCurrentTag=theTarget; //use the synonym.
-          }
-          return aCurrentTag; //if you make it here, we're ungated and found a target!
-        }//if
-        else if(theRootTags) {
-          //since we didn't find any close tags, see if there is an instance of aCurrentTag
-          //above the stack from the roottag.
-          if(HasCloseablePeerAboveRoot(*theRootTags,aContext,aCurrentTag,PR_TRUE))
-            return aCurrentTag;
-          else return eHTMLTag_unknown;
-        }
-      } //if blockcloser
-      else{
-        //Ok, a much more sensible approach for non-block closers; use the tag group to determine closure:
-        //For example: %phrasal closes %phrasal, %fontstyle and %special
-        return gHTMLElements[aCurrentTag].GetCloseTargetForEndTag(aContext,theChildIndex,aMode);
       }
-    }//if
-  } //if
+
+      if (nsHTMLElement::IsBlockCloser(aCurrentTag)) {
+        /*
+         * Here's the algorithm:
+         * Our here is sitting at aChildIndex. There are other tags above it
+         * on the stack. We have to try to close them out, but we may encounter
+         * one that can block us. The way to tell is by comparing each tag on
+         * the stack against our closeTag and rootTag list.
+         *
+         * For each tag above our hero on the stack, ask 3 questions:
+         * 1. Is it in the closeTag list? If so, the we can skip over it
+         * 2. Is it in the rootTag list? If so, then we're gated by it
+         * 3. Otherwise its non-specified and we simply presume we can close it.
+         */
+        const TagList* theCloseTags =
+          gHTMLElements[aCurrentTag].GetAutoCloseEndTags();
+        const TagList* theRootTags =
+          gHTMLElements[aCurrentTag].GetEndRootTags();
+
+        if (theCloseTags) {
+          // At a mininimum, this code is needed for H1..H6
+          while (theChildIndex < --theTopIndex) {
+            eHTMLTags theNextTag = aContext[theTopIndex];
+            if (!FindTagInSet(theNextTag, theCloseTags->mTags,
+                              theCloseTags->mCount) &&
+                FindTagInSet(theNextTag, theRootTags->mTags,
+                             theRootTags->mCount)) {
+              // We encountered a tag in root list so fail (we're gated).
+              return eHTMLTag_unknown;
+            }
+
+            // Otherwise, presume it's something we can simply ignore and
+            // continue searching.
+          }
+
+          eHTMLTags theTarget = aContext.TagAt(theChildIndex);
+          if (aCurrentTag != theTarget) {
+            aCurrentTag = theTarget;
+          }
+          // If you make it here, we're ungated and found a target!
+          return aCurrentTag;
+        } else if (theRootTags) {
+          // Since we didn't find any close tags, see if there is an instance of
+          // aCurrentTag above the stack from the roottag.
+          if (HasCloseablePeerAboveRoot(*theRootTags, aContext, aCurrentTag,
+                                        PR_TRUE)) {
+            return aCurrentTag;
+          } else {
+            return eHTMLTag_unknown;
+          }
+        }
+      } else {
+        // Ok, a much more sensible approach for non-block closers; use the tag
+        // group to determine closure: For example: %phrasal closes %phrasal,
+        // %fontstyle and %special
+        return gHTMLElements[aCurrentTag].GetCloseTargetForEndTag(aContext,
+                                                                  theChildIndex,
+                                                                  aMode);
+      }
+    }
+  }
+
   return eHTMLTag_unknown;
 }
 
-/**
- * 
- * @param   
- * @param   
- * @update  gess 10/11/99
- * @return  nada
- */
-static void StripWSFollowingTag(eHTMLTags aChildTag,nsITokenizer* aTokenizer,nsTokenAllocator* aTokenAllocator, PRInt32& aNewlineCount){ 
-  CToken* theToken= (aTokenizer)? aTokenizer->PeekToken():nsnull; 
+static void
+StripWSFollowingTag(eHTMLTags aChildTag, nsITokenizer* aTokenizer,
+                    nsTokenAllocator* aTokenAllocator, PRInt32& aNewlineCount)
+{
+  if (!aTokenizer || !aTokenAllocator) {
+    return;
+  }
 
-  if(aTokenAllocator) { 
-    while(theToken) { 
-      eHTMLTokenTypes theType=eHTMLTokenTypes(theToken->GetTokenType()); 
-      switch(theType) { 
-        case eToken_newline: ++aNewlineCount; 
-        case eToken_whitespace: 
-          theToken=aTokenizer->PopToken();
-          IF_FREE(theToken, aTokenAllocator);
-          theToken=aTokenizer->PeekToken(); 
-          break; 
-        default: 
-          theToken=0; 
-          break; 
-      } 
-    } 
-  } 
+  CToken* theToken = aTokenizer->PeekToken();
+
+  while (theToken) {
+    eHTMLTokenTypes theType = eHTMLTokenTypes(theToken->GetTokenType());
+
+    switch(theType) {
+      case eToken_newline:
+        ++aNewlineCount;
+        // Fall through...
+
+      case eToken_whitespace:
+        theToken = aTokenizer->PopToken();
+        IF_FREE(theToken, aTokenAllocator);
+
+        theToken = aTokenizer->PeekToken();
+        break;
+
+      default:
+        theToken = nsnull;
+        break;
+    }
+  }
 }
 
 /**
@@ -1683,27 +1587,27 @@ static void StripWSFollowingTag(eHTMLTags aChildTag,nsITokenizer* aTokenizer,nsT
  *  we screwed something up in the parse process. I'm not sure
  *  yet how to tell the difference.
  *  
- *  @update  gess 3/25/98
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-nsresult CNavDTD::HandleEndToken(CToken* aToken) {
-  NS_PRECONDITION(0!=aToken,kNullToken);
+nsresult
+CNavDTD::HandleEndToken(CToken* aToken)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  nsresult    result=NS_OK;
-  eHTMLTags   theChildTag=(eHTMLTags)aToken->GetTypeID();
+  nsresult    result = NS_OK;
+  eHTMLTags   theChildTag = (eHTMLTags)aToken->GetTypeID();
 
-  //Begin by dumping any attributes (bug 143512)
-  PRInt16     attrCount=aToken->GetAttributeCount();
-  CollectAttributes(nsnull,theChildTag,attrCount);
+  // Begin by dumping any attributes (bug 143512)
+  CollectAttributes(nsnull, theChildTag, aToken->GetAttributeCount());
 
-  switch(theChildTag) {
+  switch (theChildTag) {
     case eHTMLTag_link:
     case eHTMLTag_meta:
       break;
 
     case eHTMLTag_head:
-      StripWSFollowingTag(theChildTag,mTokenizer, mTokenAllocator, mLineNumber);
+      StripWSFollowingTag(theChildTag, mTokenizer, mTokenAllocator, mLineNumber);
       result = CloseContainer(eHTMLTag_head);
       break;
 
@@ -1713,19 +1617,22 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
 
     case eHTMLTag_br:
       {
-          //This is special NAV-QUIRKS code that allows users
-          //to use </BR>, even though that isn't a legitimate tag.
-        if(eDTDMode_quirks==mDTDMode) {
-          // Use recycler and pass the token thro' HandleToken() to fix bugs like 32782.
-          CHTMLToken* theToken = NS_STATIC_CAST(CHTMLToken*,mTokenAllocator->CreateTokenOfType(eToken_start,theChildTag));
-          result=HandleToken(theToken,mParser);
+        // This is special NAV-QUIRKS code that allows users to use </BR>, even
+        // though that isn't a legitimate tag.
+        if (eDTDMode_quirks == mDTDMode) {
+          // Use recycler and pass the token thro' HandleToken() to fix bugs
+          // like 32782.
+          CToken* theToken = mTokenAllocator->CreateTokenOfType(eToken_start,
+                                                                theChildTag);
+          result = HandleToken(theToken, mParser);
         }
       }
       break;
 
     case eHTMLTag_body:
     case eHTMLTag_html:
-      StripWSFollowingTag(theChildTag,mTokenizer,mTokenAllocator,mLineNumber);
+      StripWSFollowingTag(theChildTag, mTokenizer, mTokenAllocator,
+                          mLineNumber);
       break;
 
     case eHTMLTag_script:
@@ -1747,42 +1654,46 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
 
     default:
      {
-        //now check to see if this token should be omitted, or 
-        //if it's gated from closing by the presence of another tag.
-        if(gHTMLElements[theChildTag].CanOmitEndTag()) {
+        // Now check to see if this token should be omitted, or
+        // if it's gated from closing by the presence of another tag.
+        if (gHTMLElements[theChildTag].CanOmitEndTag()) {
           PopStyle(theChildTag);
-        }
-        else {
-          eHTMLTags theParentTag=mBodyContext->Last();
-
-          if(kNotFound==nsHTMLElement::GetIndexOfChildOrSynonym(*mBodyContext,theChildTag)) {
+        } else {
+          eHTMLTags theParentTag = mBodyContext->Last();
 
+          if (kNotFound ==
+                nsHTMLElement::GetIndexOfChildOrSynonym(*mBodyContext,
+                                                        theChildTag)) {
             // Ref: bug 30487
             // Make sure that we don't cross boundaries, of certain elements,
             // to close stylistic information.
-            // Ex. <font face="helvetica"><table><tr><td></font></td></tr></table> some text...
-            // In the above ex. the orphaned FONT tag, inside TD, should cross TD boundaryto 
-            // close the FONT tag above TABLE. 
-            static eHTMLTags gBarriers[]={eHTMLTag_thead,eHTMLTag_tbody,eHTMLTag_tfoot,eHTMLTag_table};
+            // <font face="helvetica"><table><tr><td></font></td></tr></table> some text...
+            // In the above ex. the orphaned FONT tag, inside TD, should cross
+            // TD boundary to close the FONT tag above TABLE.
+            static eHTMLTags gBarriers[] = {
+              eHTMLTag_thead, eHTMLTag_tbody, eHTMLTag_tfoot, eHTMLTag_table
+            };
 
-            if(!FindTagInSet(theParentTag,gBarriers,sizeof(gBarriers)/sizeof(theParentTag))) {
-              if(nsHTMLElement::IsResidualStyleTag(theChildTag)) {
-                mBodyContext->RemoveStyle(theChildTag); // fix bug 77746
-              }
+            if (!FindTagInSet(theParentTag, gBarriers,
+                              NS_ARRAY_LENGTH(gBarriers)) &&
+                nsHTMLElement::IsResidualStyleTag(theChildTag)) {
+              // Fix bug 77746
+              mBodyContext->RemoveStyle(theChildTag);
             }
 
-            // If the bit kHandleStrayTag is set then we automatically open up a matching
-            // start tag ( compatibility ).  Currently this bit is set on P tag.
-            // This also fixes Bug: 22623
-            if(gHTMLElements[theChildTag].HasSpecialProperty(kHandleStrayTag) &&
-               mDTDMode != eDTDMode_full_standards &&
-               mDTDMode != eDTDMode_almost_standards) {
+            // If the bit kHandleStrayTag is set then we automatically open up a
+            // matching start tag (compatibility).  Currently this bit is set on
+            // P tag.  This also fixes Bug: 22623
+            if (gHTMLElements[theChildTag].HasSpecialProperty(kHandleStrayTag) &&
+                mDTDMode != eDTDMode_full_standards &&
+                mDTDMode != eDTDMode_almost_standards) {
               // Oh boy!! we found a "stray" tag. Nav4.x and IE introduce line break in
               // such cases. So, let's simulate that effect for compatibility.
               // Ex. <html><body>Hello</P>There</body></html>
-              PRBool theParentContains=-1; //set to -1 to force canomit to recompute.
-              if(!CanOmit(theParentTag,theChildTag,theParentContains)) {
-                CHTMLToken* theStartToken = NS_STATIC_CAST(CHTMLToken*,mTokenAllocator->CreateTokenOfType(eToken_start,theChildTag));
+              PRBool theParentContains = -1;
+              if (!CanOmit(theParentTag, theChildTag, theParentContains)) {
+                CToken* theStartToken =
+                  mTokenAllocator->CreateTokenOfType(eToken_start, theChildTag);
 
                 // This check for NS_DTD_FLAG_IN_MISPLACED_CONTENT was added
                 // to fix bug 142965.
@@ -1791,11 +1702,10 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
                   // 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 
+                  mTokenizer->PushTokenFront(aToken);
+                  mTokenizer->PushTokenFront(theStartToken);
+                } 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);
@@ -1807,16 +1717,18 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
             }
             return result;
           }
-          if(result==NS_OK) {
-            eHTMLTags theTarget=FindAutoCloseTargetForEndTag(theChildTag,*mBodyContext,mDTDMode);
-            if(eHTMLTag_unknown!=theTarget) {
+          if (result == NS_OK) {
+            eHTMLTags theTarget =
+              FindAutoCloseTargetForEndTag(theChildTag, *mBodyContext,
+                                           mDTDMode);
+            if (eHTMLTag_unknown != theTarget) {
               if (nsHTMLElement::IsResidualStyleTag(theChildTag)) {
-                result=OpenTransientStyles(theChildTag); 
-                if(NS_FAILED(result)) {
+                result = OpenTransientStyles(theChildTag);
+                if (NS_FAILED(result)) {
                   return result;
                 }
               }
-              result=CloseContainersTo(theTarget,PR_FALSE);
+              result = CloseContainersTo(theTarget, PR_FALSE);
             }
           }
         }
@@ -1837,94 +1749,105 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
  * @param  aTag - This ought to be a table tag
  *
  */
-nsresult CNavDTD::HandleSavedTokens(PRInt32 anIndex) {
-    NS_PRECONDITION(mBodyContext != nsnull && mBodyContext->GetCount() > 0,"invalid context");
+nsresult
+CNavDTD::HandleSavedTokens(PRInt32 anIndex)
+{
+  NS_PRECONDITION(mBodyContext != nsnull && mBodyContext->GetCount() > 0, "invalid context");
 
-    nsresult  result      = NS_OK;
+  nsresult  result = NS_OK;
 
-    if(anIndex>kNotFound) {
-      PRInt32  theBadTokenCount   = mMisplacedContent.GetSize();
+  if (anIndex > kNotFound) {
+    PRInt32 theBadTokenCount = mMisplacedContent.GetSize();
 
-      if(theBadTokenCount > 0) {
-        mFlags |= NS_DTD_FLAG_IN_MISPLACED_CONTENT;
+    if (theBadTokenCount > 0) {
+      mFlags |= NS_DTD_FLAG_IN_MISPLACED_CONTENT;
 
-        if(mTempContext==nsnull) mTempContext=new nsDTDContext();
-
-        CToken*   theToken;
-        eHTMLTags theTag;
-        PRInt32   attrCount;
-        PRInt32   theTopIndex = anIndex + 1;
-        PRInt32   theTagCount = mBodyContext->GetCount();
-               
-        if (mSink && mSink->IsFormOnStack()) {
-          // Do this to synchronize dtd stack and the sink stack.
-          // Note: FORM is never on the dtd stack because its always 
-          // considered as a leaf. However, in the sink FORM can either
-          // be a container or a leaf. Therefore, we have to check
-          // with the sink -- Ref: Bug 20087.
-          ++anIndex;
-        }
-
-        STOP_TIMER()
-        MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));     
-        // Pause the main context and switch to the new context.
-        mSink->BeginContext(anIndex);
-        MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));
-        START_TIMER()
-      
-        // The body context should contain contents only upto the marked position.  
-        mBodyContext->MoveEntries(*mTempContext, theTagCount - theTopIndex);
-     
-        // Now flush out all the bad contents.
-        while(theBadTokenCount-- > 0){
-          theToken=(CToken*)mMisplacedContent.PopFront();
-          if(theToken) {
-            theTag       = (eHTMLTags)theToken->GetTypeID();
-            attrCount    = theToken->GetAttributeCount();
-            // Put back attributes, which once got popped out, into the tokenizer
-            for(PRInt32 j=0;j<attrCount; ++j){
-              CToken* theAttrToken = (CToken*)mMisplacedContent.PopFront();
-              if(theAttrToken) {
-                mTokenizer->PushTokenFront(theAttrToken);
-              }
-              theBadTokenCount--;
-            }
-            
-            if(eToken_end==theToken->GetTokenType()) {
-              // Ref: Bug 25202
-              // Make sure that the BeginContext() is ended only by the call to
-              // EndContext(). Ex: <center><table><a></center>.
-              // In the Ex. above </center> should not close <center> above table.
-              // Doing so will cause the current context to get closed prematurely. 
-              PRInt32 theIndex=mBodyContext->LastOf(theTag);
-              
-              if(theIndex!=kNotFound && theIndex<=mBodyContext->mContextTopIndex) {
-                IF_FREE(theToken, mTokenAllocator);
-                continue;
-              }
-            }
-            result=HandleToken(theToken,mParser);
-          }
-        }//while
-        if(theTopIndex != mBodyContext->GetCount()) {
-           CloseContainersTo(theTopIndex,mBodyContext->TagAt(theTopIndex),PR_TRUE);
-        }
-     
-        // Bad-contents were successfully processed. Now, itz time to get
-        // back to the original body context state.
-        mTempContext->MoveEntries(*mBodyContext, theTagCount - theTopIndex);
-
-        STOP_TIMER()
-        MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));     
-        // Terminate the new context and switch back to the main context
-        mSink->EndContext(anIndex);
-        MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));
-        START_TIMER()
-
-        mFlags &= ~NS_DTD_FLAG_IN_MISPLACED_CONTENT;
+      if (!mTempContext && !(mTempContext = new nsDTDContext())) {
+        return NS_ERROR_OUT_OF_MEMORY;
       }
+
+      CToken*   theToken;
+      eHTMLTags theTag;
+      PRInt32   attrCount;
+      PRInt32   theTopIndex = anIndex + 1;
+      PRInt32   theTagCount = mBodyContext->GetCount();
+
+      if (mSink && mSink->IsFormOnStack()) {
+        // Do this to synchronize dtd stack and the sink stack.
+        // Note: FORM is never on the dtd stack because its always
+        // considered as a leaf. However, in the sink FORM can either
+        // be a container or a leaf. Therefore, we have to check
+        // with the sink -- Ref: Bug 20087.
+        ++anIndex;
+      }
+
+      STOP_TIMER()
+      MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));
+      // Pause the main context and switch to the new context.
+      mSink->BeginContext(anIndex);
+      MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));
+      START_TIMER()
+
+      // The body context should contain contents only upto the marked position.
+      mBodyContext->MoveEntries(*mTempContext, theTagCount - theTopIndex);
+
+      // Now flush out all the bad contents.
+      while (theBadTokenCount-- > 0){
+        theToken = (CToken*)mMisplacedContent.PopFront();
+        if (theToken) {
+          theTag       = (eHTMLTags)theToken->GetTypeID();
+          attrCount    = theToken->GetAttributeCount();
+          // Put back attributes, which once got popped out, into the tokenizer
+          for (PRInt32 j = 0; j < attrCount; ++j) {
+            CToken* theAttrToken = (CToken*)mMisplacedContent.PopFront();
+            if (theAttrToken) {
+              mTokenizer->PushTokenFront(theAttrToken);
+            }
+            theBadTokenCount--;
+          }
+
+          if (eToken_end == theToken->GetTokenType()) {
+            // Ref: Bug 25202
+            // Make sure that the BeginContext() is ended only by the call to
+            // EndContext(). Ex: <center><table><a></center>.
+            // In the Ex. above </center> should not close <center> above table.
+            // Doing so will cause the current context to get closed prematurely.
+            PRInt32 theIndex = mBodyContext->LastOf(theTag);
+
+            if (theIndex != kNotFound &&
+                theIndex <= mBodyContext->mContextTopIndex) {
+              IF_FREE(theToken, mTokenAllocator);
+              continue;
+            }
+          }
+
+          // XXX This should go away, with this call, it becomes extremely
+          // difficult to handle misplaced style and link tags, since it's hard
+          // to propagate the block return all the way up and then re-enter this
+          // method.
+          result = HandleToken(theToken, mParser);
+        }
+      }
+      if (theTopIndex != mBodyContext->GetCount()) {
+        CloseContainersTo(theTopIndex, mBodyContext->TagAt(theTopIndex),
+                          PR_TRUE);
+      }
+
+      // Bad-contents were successfully processed. Now, itz time to get
+      // back to the original body context state.
+      mTempContext->MoveEntries(*mBodyContext, theTagCount - theTopIndex);
+
+      STOP_TIMER()
+      MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));
+      // Terminate the new context and switch back to the main context
+      mSink->EndContext(anIndex);
+      MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleSavedTokensAbove(), this=%p\n", this));
+      START_TIMER()
+
+      mFlags &= ~NS_DTD_FLAG_IN_MISPLACED_CONTENT;
     }
-    return result;
+  }
+  return result;
 }
 
 
@@ -1936,40 +1859,47 @@ nsresult CNavDTD::HandleSavedTokens(PRInt32 anIndex) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-nsresult CNavDTD::HandleEntityToken(CToken* aToken) {
-  NS_PRECONDITION(0!=aToken,kNullToken);
+nsresult
+CNavDTD::HandleEntityToken(CToken* aToken)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  nsresult  result=NS_OK;
+  nsresult  result = NS_OK;
 
   const nsSubstring& theStr = aToken->GetStringValue();
 
-  if((kHashsign!=theStr.First()) && (-1==nsHTMLEntities::EntityToUnicode(theStr))){
-    //if you're here we have a bogus entity.
-    //convert it into a text token.
-    CToken *theToken=0;
+  if (kHashsign != theStr.First() &&
+      -1 == nsHTMLEntities::EntityToUnicode(theStr)) {
+    // If you're here we have a bogus entity.
+    // Convert it into a text token.
+    CToken *theToken;
 
     nsAutoString entityName;
     entityName.AssignLiteral("&");
-    entityName.Append(theStr); //should append the entity name; fix bug 51161.
-    theToken = mTokenAllocator->CreateTokenOfType(eToken_text,eHTMLTag_text,entityName);
+    entityName.Append(theStr);
+    theToken = mTokenAllocator->CreateTokenOfType(eToken_text, eHTMLTag_text,
+                                                  entityName);
+    if (!theToken) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
 
-    return HandleToken(theToken,mParser); //theToken should get recycled automagically...
+    // theToken should get recycled automagically...
+    return HandleToken(theToken, mParser);
   }
 
-  eHTMLTags theParentTag=mBodyContext->Last();
+  eHTMLTags theParentTag = mBodyContext->Last();
+  nsCParserNode* theNode = mNodeAllocator.CreateNode(aToken, mTokenAllocator);
 
-  nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken, mTokenAllocator);
-  if(theNode) {
-    PRBool theParentContains=-1; //set to -1 to force CanOmit to recompute...
-    if(CanOmit(theParentTag,eHTMLTag_entity,theParentContains)) {
-      eHTMLTags theCurrTag=(eHTMLTags)aToken->GetTypeID();
-      result=HandleOmittedTag(aToken,theCurrTag,theParentTag,theNode);
-    }
-    else {
-      result=AddLeaf(theNode);
+  if (theNode) {
+    PRBool theParentContains = -1;
+    if (CanOmit(theParentTag, eHTMLTag_entity, theParentContains)) {
+      eHTMLTags theCurrTag = (eHTMLTags)aToken->GetTypeID();
+      HandleOmittedTag(aToken, theCurrTag, theParentTag, theNode);
+    } else {
+      result = AddLeaf(theNode);
     }
     IF_FREE(theNode, &mNodeAllocator);
-  }  
+  }
   return result;
 }
 
@@ -1983,19 +1913,22 @@ nsresult CNavDTD::HandleEntityToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-nsresult CNavDTD::HandleCommentToken(CToken* aToken) {
-  NS_PRECONDITION(0!=aToken,kNullToken);
-  
-  nsresult  result=NS_OK;
+nsresult
+CNavDTD::HandleCommentToken(CToken* aToken)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken, mTokenAllocator);
+  nsresult result = NS_OK;
 
-  if(theNode) {
+  nsCParserNode* theNode = mNodeAllocator.CreateNode(aToken, mTokenAllocator);
 
+  if (theNode) {
     STOP_TIMER();
     MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleCommentToken(), this=%p\n", this));
 
-    result=(mSink) ? mSink->AddComment(*theNode) : NS_OK;  
+    result = mSink
+             ? mSink->AddComment(*theNode)
+             : NS_OK;
 
     IF_FREE(theNode, &mNodeAllocator);
 
@@ -2008,19 +1941,19 @@ nsresult CNavDTD::HandleCommentToken(CToken* aToken) {
 
 
 /**
- *  This method gets called when an attribute token has been 
+ *  This method gets called when an attribute token has been
  *  encountered in the parse process. This is an error, since
  *  all attributes should have been accounted for in the prior
  *  start or end tokens
- *  
+ *
  *  @update  gess 3/25/98
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-nsresult CNavDTD::HandleAttributeToken(CToken* aToken) {
-  NS_PRECONDITION(0!=aToken,kNullToken);
-  NS_ERROR("attribute encountered -- this shouldn't happen unless the attribute was not part of a start tag!");
-
+nsresult
+CNavDTD::HandleAttributeToken(CToken* aToken)
+{
+  NS_ERROR("attribute encountered -- this shouldn't happen.");
   return NS_OK;
 }
 
@@ -2032,18 +1965,22 @@ nsresult CNavDTD::HandleAttributeToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-nsresult CNavDTD::HandleProcessingInstructionToken(CToken* aToken){
-  NS_PRECONDITION(0!=aToken,kNullToken);
+nsresult
+CNavDTD::HandleProcessingInstructionToken(CToken* aToken)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  nsresult  result=NS_OK;
+  nsresult result = NS_OK;
 
-  nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken, mTokenAllocator);
-  if(theNode) {
+  nsCParserNode* theNode = mNodeAllocator.CreateNode(aToken, mTokenAllocator);
 
+  if (theNode) {
     STOP_TIMER();
     MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleProcessingInstructionToken(), this=%p\n", this));
 
-    result=(mSink) ? mSink->AddProcessingInstruction(*theNode) : NS_OK; 
+    result = mSink
+             ? mSink->AddProcessingInstruction(*theNode)
+             : NS_OK;
 
     IF_FREE(theNode, &mNodeAllocator);
 
@@ -2062,38 +1999,44 @@ nsresult CNavDTD::HandleProcessingInstructionToken(CToken* aToken){
  *  @param   aToken -- The very first token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-nsresult CNavDTD::HandleDocTypeDeclToken(CToken* aToken){
-  NS_PRECONDITION(0!=aToken,kNullToken);
+nsresult
+CNavDTD::HandleDocTypeDeclToken(CToken* aToken)
+{
+  NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  nsresult result=NS_OK;
+  nsresult result = NS_OK;
 
-  CDoctypeDeclToken* theToken = NS_STATIC_CAST(CDoctypeDeclToken*,aToken);
+  CDoctypeDeclToken* theToken = NS_STATIC_CAST(CDoctypeDeclToken*, aToken);
   nsAutoString docTypeStr(theToken->GetStringValue());
+  // XXX Doesn't this count the newlines twice?
   if (!IsParserInDocWrite()) {
     mLineNumber += docTypeStr.CountChar(kNewLine);
   }
-  
-  PRInt32 len=docTypeStr.Length();
-  PRInt32 pos=docTypeStr.RFindChar(kGreaterThan);
-  if(pos>-1) {
-    docTypeStr.Cut(pos,len-pos);// First remove '>' from the end.
+
+  PRInt32 len = docTypeStr.Length();
+  PRInt32 pos = docTypeStr.RFindChar(kGreaterThan);
+  if (pos != kNotFound) {
+    // First remove '>' from the end.
+    docTypeStr.Cut(pos, len - pos);
   }
-  docTypeStr.Cut(0,2); // Now remove "<!" from the begining
+
+  // Now remove "<!" from the begining
+  docTypeStr.Cut(0, 2);
   theToken->SetStringValue(docTypeStr);
 
-  nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken, mTokenAllocator);
-  if(theNode) {
+  nsCParserNode* theNode = mNodeAllocator.CreateNode(aToken, mTokenAllocator);
+  if (theNode) {
+    STOP_TIMER();
+    MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleDocTypeDeclToken(), this=%p\n", this));
 
-  STOP_TIMER();
-  MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleDocTypeDeclToken(), this=%p\n", this));
-  
-  result = (mSink)? mSink->AddDocTypeDecl(*theNode):NS_OK;
-    
-  IF_FREE(theNode, &mNodeAllocator);
-  
-  MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleDocTypeDeclToken(), this=%p\n", this));
-  START_TIMER();
+    result = mSink
+             ? mSink->AddDocTypeDecl(*theNode)
+             : NS_OK;
 
+    IF_FREE(theNode, &mNodeAllocator);
+
+    MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleDocTypeDeclToken(), this=%p\n", this));
+    START_TIMER();
   }
   return result;
 }
@@ -2107,20 +2050,20 @@ nsresult CNavDTD::HandleDocTypeDeclToken(CToken* aToken){
  * @param   aCount is the # of attributes you're expecting
  * @return error code (should be 0)
  */
-nsresult CNavDTD::CollectAttributes(nsIParserNode *aNode, eHTMLTags aTag,
-                                    PRInt32 aCount)
+nsresult
+CNavDTD::CollectAttributes(nsIParserNode *aNode, eHTMLTags aTag, PRInt32 aCount)
 {
-  int attr=0;
+  int attr = 0;
+  nsresult result = NS_OK;
+  int theAvailTokenCount = mTokenizer->GetCount();
 
-  nsresult result=NS_OK;
-  int theAvailTokenCount=mTokenizer->GetCount();
-  if(aCount<=theAvailTokenCount) {
-    CToken* theToken=0;
-    for(attr=0;attr<aCount;++attr){
-      theToken=mTokenizer->PopToken();
-      if(theToken)  {
-        eHTMLTokenTypes theType=eHTMLTokenTypes(theToken->GetTokenType());
-        if(theType!=eToken_attribute) {
+  if (aCount <= theAvailTokenCount) {
+    CToken* theToken;
+    for (attr = 0; attr < aCount; ++attr) {
+      theToken = mTokenizer->PopToken();
+      if (theToken) {
+        eHTMLTokenTypes theType = eHTMLTokenTypes(theToken->GetTokenType());
+        if (theType != eToken_attribute) {
           // If you're here then it means that the token does not
           // belong to this node. Put the token back into the tokenizer
           // and let it go thro' the regular path. Bug: 59189.
@@ -2132,7 +2075,7 @@ nsresult CNavDTD::CollectAttributes(nsIParserNode *aNode, eHTMLTags aTag,
           mLineNumber += theToken->GetNewlineCount();
         }
 
-        if(aNode) {
+        if (aNode) {
           // If the key is empty, the attribute is unusable, so we should not
           // add it to the node.
           if (!((CAttributeToken*)theToken)->GetKey().IsEmpty()) {
@@ -2145,9 +2088,8 @@ nsresult CNavDTD::CollectAttributes(nsIParserNode *aNode, eHTMLTags aTag,
         }
       }
     }
-  }
-  else {
-    result=kEOF;
+  } else {
+    result = kEOF;
   }
   return result;
 }
@@ -2161,30 +2103,29 @@ nsresult CNavDTD::CollectAttributes(nsIParserNode *aNode, eHTMLTags aTag,
  *  @param   aChild -- tag enum of child container
  *  @return  PR_TRUE if parent can contain child
  */
-PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const 
+PRBool
+CNavDTD::CanContain(PRInt32 aParent, PRInt32 aChild) const
 {
-  PRBool result=gHTMLElements[aParent].CanContain((eHTMLTags)aChild,mDTDMode);
+  PRBool result = gHTMLElements[aParent].CanContain((eHTMLTags)aChild, mDTDMode);
 
 #ifdef ALLOW_TR_AS_CHILD_OF_TABLE
-  if(!result) {
+  if (!result) {
       //XXX This vile hack is here to support bug 30378, which allows
       //table to contain tr directly in an html32 document.
-    if((eHTMLTag_tr==aChild) && (eHTMLTag_table==aParent)) {
-      result=PR_TRUE;
+    if ((eHTMLTag_tr == aChild) && (eHTMLTag_table == aParent)) {
+      result = PR_TRUE;
     }
   }
 #endif
 
-  if(eHTMLTag_nobr==aChild) {
-    if(IsInlineElement(aParent,aParent)){
-      if(HasOpenContainer((eHTMLTags)aChild)) {
-        return PR_FALSE;
-      }
-    }
+  if (eHTMLTag_nobr == aChild           &&
+      IsInlineElement(aParent, aParent) &&
+      HasOpenContainer(eHTMLTag_nobr)) {
+    return PR_FALSE;
   }
 
   return result;
-} 
+}
 
 /**
  *  This method is called to determine whether or not
@@ -2195,19 +2136,17 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const
  *  @param   aParentID -- tag id of parent (or eHTMLTag_unknown)
  *  @return  PR_TRUE if this tag is a block tag
  */
-PRBool CNavDTD::IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const {
-  PRBool result=PR_FALSE;
-  eHTMLTags theTag=(eHTMLTags)aTagID;
+PRBool
+CNavDTD::IsBlockElement(PRInt32 aTagID, PRInt32 aParentID) const
+{
+  eHTMLTags theTag = (eHTMLTags)aTagID;
 
-  if((theTag>eHTMLTag_unknown) && (theTag<eHTMLTag_userdefined)) {
-    result=((gHTMLElements[theTag].IsMemberOf(kBlock))       || 
-            (gHTMLElements[theTag].IsMemberOf(kBlockEntity)) || 
-            (gHTMLElements[theTag].IsMemberOf(kHeading))     || 
-            (gHTMLElements[theTag].IsMemberOf(kPreformatted))|| 
-            (gHTMLElements[theTag].IsMemberOf(kList))); 
-  }
-
-  return result;
+  return (theTag > eHTMLTag_unknown && theTag < eHTMLTag_userdefined) &&
+          (gHTMLElements[theTag].IsMemberOf(kBlock)        ||
+           gHTMLElements[theTag].IsMemberOf(kBlockEntity)  ||
+           gHTMLElements[theTag].IsMemberOf(kHeading)      ||
+           gHTMLElements[theTag].IsMemberOf(kPreformatted) ||
+           gHTMLElements[theTag].IsMemberOf(kList));
 }
 
 /**
@@ -2219,19 +2158,17 @@ PRBool CNavDTD::IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const {
  *  @param   aParentID -- tag id of parent (or eHTMLTag_unknown)
  *  @return  PR_TRUE if this tag is an inline tag
  */
-PRBool CNavDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const {
-  PRBool result=PR_FALSE;
-  eHTMLTags theTag=(eHTMLTags)aTagID;
+PRBool
+CNavDTD::IsInlineElement(PRInt32 aTagID, PRInt32 aParentID) const
+{
+  eHTMLTags theTag = (eHTMLTags)aTagID;
 
-  if((theTag>eHTMLTag_unknown) && (theTag<eHTMLTag_userdefined)) {
-    result=((gHTMLElements[theTag].IsMemberOf(kInlineEntity))|| 
-            (gHTMLElements[theTag].IsMemberOf(kFontStyle))   || 
-            (gHTMLElements[theTag].IsMemberOf(kPhrase))      || 
-            (gHTMLElements[theTag].IsMemberOf(kSpecial))     || 
-            (gHTMLElements[theTag].IsMemberOf(kFormControl)));
-  }
-
-  return result;
+  return (theTag > eHTMLTag_unknown && theTag < eHTMLTag_userdefined) &&
+          (gHTMLElements[theTag].IsMemberOf(kInlineEntity) ||
+           gHTMLElements[theTag].IsMemberOf(kFontStyle)    ||
+           gHTMLElements[theTag].IsMemberOf(kPhrase)       ||
+           gHTMLElements[theTag].IsMemberOf(kSpecial)      ||
+           gHTMLElements[theTag].IsMemberOf(kFormControl));
 }
 
 /**
@@ -2244,37 +2181,40 @@ PRBool CNavDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const {
  *  @param   aChild -- tag enum of child container
  *  @return  PR_TRUE if propagation should occur
  */
-PRBool CNavDTD::CanPropagate(eHTMLTags aParent,eHTMLTags aChild,PRBool aParentContains)  {
-  PRBool    result=PR_FALSE;
-  PRBool    theParentContains=(-1==aParentContains) ? CanContain(aParent,aChild) : aParentContains;
+PRBool
+CNavDTD::CanPropagate(eHTMLTags aParent, eHTMLTags aChild,
+                      PRBool aParentContains)
+{
+  PRBool result = PR_FALSE;
+  if (aParentContains == -1) {
+    aParentContains = CanContain(aParent, aChild);
+  }
 
-  if(aParent==aChild) {
+  if (aParent == aChild) {
     return result;
   }
 
-  if(nsHTMLElement::IsContainer(aChild)){
+  if (nsHTMLElement::IsContainer(aChild)) {
     mScratch.Truncate();
-    if(!gHTMLElements[aChild].HasSpecialProperty(kNoPropagate)){
-      if(nsHTMLElement::IsBlockParent(aParent) || (gHTMLElements[aParent].GetSpecialChildren())) {
-
-        result=ForwardPropagate(mScratch,aParent,aChild);
-
-        if(PR_FALSE==result){
-
-          if(eHTMLTag_unknown!=aParent) {
-            if(aParent!=aChild) //dont even bother if we're already inside a similar element...
-              result=BackwardPropagate(mScratch,aParent,aChild);
-          } //if
-          else result=BackwardPropagate(mScratch,eHTMLTag_html,aChild);
-
-        } //elseif
-
-      }//if
-    }//if
-    if(mScratch.Length()-1>gHTMLElements[aParent].mPropagateRange)
-      result=PR_FALSE;
-  }//if
-  else result=theParentContains;
+    if (!gHTMLElements[aChild].HasSpecialProperty(kNoPropagate)) {
+      if (nsHTMLElement::IsBlockParent(aParent) ||
+          gHTMLElements[aParent].GetSpecialChildren()) {
+        result = ForwardPropagate(mScratch, aParent, aChild);
+        if (!result) {
+          if (eHTMLTag_unknown != aParent) {
+            result = BackwardPropagate(mScratch, aParent, aChild);
+          } else {
+            result = BackwardPropagate(mScratch, eHTMLTag_html, aChild);
+          }
+        }
+      }
+    }
+    if (mScratch.Length() - 1 > gHTMLElements[aParent].mPropagateRange) {
+      result = PR_FALSE;
+    }
+  } else {
+    result = aParentContains;
+  }
 
 
   return result;
@@ -2285,73 +2225,58 @@ PRBool CNavDTD::CanPropagate(eHTMLTags aParent,eHTMLTags aChild,PRBool aParentCo
  *  This method gets called to determine whether a given 
  *  tag can be omitted from opening. Most cannot.
  *  
- *  @update  gess 3/25/98
  *  @param   aParent
  *  @param   aChild
  *  @param   aParentContains
  *  @return  PR_TRUE if given tag can contain other tags
  */
-PRBool CNavDTD::CanOmit(eHTMLTags aParent,eHTMLTags aChild,PRBool& aParentContains)  {
-
-  eHTMLTags theAncestor=gHTMLElements[aChild].mExcludingAncestor;
-  if (eHTMLTag_unknown!=theAncestor){
-    if (HasOpenContainer(theAncestor)) {
-      return PR_TRUE;
-    }
-  }
-
-  theAncestor=gHTMLElements[aChild].mRequiredAncestor;
-  if(eHTMLTag_unknown!=theAncestor){
-    if(!HasOpenContainer(theAncestor)) {
-      if(!CanPropagate(aParent,aChild,aParentContains)) {
-        return PR_TRUE;
-      }
-    }
-    return PR_FALSE;
-  }
-
-
-  if(gHTMLElements[aParent].CanExclude(aChild)){
+PRBool
+CNavDTD::CanOmit(eHTMLTags aParent, eHTMLTags aChild, PRBool& aParentContains)
+{
+  eHTMLTags theAncestor = gHTMLElements[aChild].mExcludingAncestor;
+  if (eHTMLTag_unknown != theAncestor && HasOpenContainer(theAncestor)) {
     return PR_TRUE;
   }
 
-    //Now the obvious test: if the parent can contain the child, don't omit.
-  if(-1==aParentContains)
-    aParentContains=CanContain(aParent,aChild);
+  theAncestor = gHTMLElements[aChild].mRequiredAncestor;
+  if (eHTMLTag_unknown != theAncestor) {
+    // If there's a required ancestor, we only omit if it isn't open and we
+    // can't get to it through propagation.
+    return !HasOpenContainer(theAncestor) &&
+           !CanPropagate(aParent, aChild, aParentContains);
+  }
 
-  if(aParentContains || (aChild==aParent)){
+  if (gHTMLElements[aParent].CanExclude(aChild)) {
+    return PR_TRUE;
+  }
+
+  // Now the obvious test: if the parent can contain the child, don't omit.
+  if (-1 == aParentContains) {
+    aParentContains = CanContain(aParent, aChild);
+  }
+  
+  if (aParentContains || aChild == aParent) {
     return PR_FALSE;
   }
 
-  if(gHTMLElements[aParent].IsBlockEntity()) {
-    if(nsHTMLElement::IsInlineEntity(aChild)) {  //feel free to drop inlines that a block doesn't contain.
-      return PR_TRUE;
-    }
+  if (gHTMLElements[aParent].IsBlockEntity() &&
+      nsHTMLElement::IsInlineEntity(aChild)) {
+    // Feel free to drop inlines that a block doesn't contain.
+    return PR_TRUE;
   }
 
-  if(gHTMLElements[aParent].HasSpecialProperty(kBadContentWatch)) {
-
-    if(-1==aParentContains) {    
-      //we need to compute parent containment here, since it wasn't given...
-      if(!gHTMLElements[aParent].CanContain(aChild,mDTDMode)){
-        return PR_TRUE;
-      }
-    }
-    else if (!aParentContains) {
-      if(!gHTMLElements[aChild].HasSpecialProperty(kBadContentWatch)) {
-        return PR_TRUE; 
-      }
-      return PR_FALSE; // Ref. Bug 25658
-    }
+  if (gHTMLElements[aParent].HasSpecialProperty(kBadContentWatch)) {
+    // We can only omit this child if it does not have the kBadContentWatch
+    // special property.
+    return !gHTMLElements[aChild].HasSpecialProperty(kBadContentWatch);
   }
 
-  if(gHTMLElements[aParent].HasSpecialProperty(kSaveMisplaced)) {
+  if (gHTMLElements[aParent].HasSpecialProperty(kSaveMisplaced)) {
     return PR_TRUE;
   }
 
   return PR_FALSE;
 }
-     
 
 /**
  *  This method gets called to determine whether a given 
@@ -2361,148 +2286,96 @@ PRBool CNavDTD::CanOmit(eHTMLTags aParent,eHTMLTags aChild,PRBool& aParentContai
  *  @param   aTag -- tag to test as a container
  *  @return  PR_TRUE if given tag can contain other tags
  */
-PRBool CNavDTD::IsContainer(PRInt32 aTag) const {
+PRBool
+CNavDTD::IsContainer(PRInt32 aTag) const
+{
   return nsHTMLElement::IsContainer((eHTMLTags)aTag);
 }
 
 
-/**
- * This method tries to design a context vector (without actually
- * changing our parser state) from the parent down to the
- * child. 
- * 
- * @update  gess4/6/98
- * @param   aVector is the string where we store our output vector
- *          in bottom-up order.
- * @param   aParent -- tag type of parent
- * @param   aChild -- tag type of child
- * @return  TRUE if propagation closes; false otherwise
- */
-PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild)  {
-  PRBool result=PR_FALSE;
+PRBool
+CNavDTD::ForwardPropagate(nsString& aSequence, eHTMLTags aParent,
+                          eHTMLTags aChild)
+{
+  PRBool result = PR_FALSE;
 
   switch(aParent) {
     case eHTMLTag_table:
-      {
-        if((eHTMLTag_tr==aChild) || (eHTMLTag_td==aChild)) {
-          return BackwardPropagate(aSequence,aParent,aChild);
-        }
+      if (eHTMLTag_tr == aChild || eHTMLTag_td == aChild) {
+        return BackwardPropagate(aSequence, aParent, aChild);
       }
-      //otherwise, intentionally fall through...
+      // Otherwise, intentionally fall through...
 
     case eHTMLTag_tr:
-      {  
-        PRBool theCanContainResult=CanContain(eHTMLTag_td,aChild);
-        if(PR_TRUE==theCanContainResult) {
-          aSequence.Append((PRUnichar)eHTMLTag_td);
-          result=BackwardPropagate(aSequence,aParent,eHTMLTag_td);
-        }
+      if (CanContain(eHTMLTag_td, aChild)) {
+        aSequence.Append((PRUnichar)eHTMLTag_td);
+        result = BackwardPropagate(aSequence, aParent, eHTMLTag_td);
       }
       break;
 
-    case eHTMLTag_th:
-      break;
-
     default:
       break;
-  }//switch
+  }
+
   return result;
 }
 
-
-/**
- * This method tries to design a context map (without actually
- * changing our parser state) from the child up to the parent.
- *
- * @update  gess4/6/98
- * @param   aVector is the string where we store our output vector
- *          in bottom-up order.
- * @param   aParent -- tag type of parent
- * @param   aChild -- tag type of child
- * @return  TRUE if propagation closes; false otherwise
- */
-PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) const {
-
-  eHTMLTags theParent=aParent; //just init to get past first condition...
+PRBool
+CNavDTD::BackwardPropagate(nsString& aSequence, eHTMLTags aParent,
+                           eHTMLTags aChild) const
+{
+  eHTMLTags theParent = aParent;
 
   do {
-    const TagList* theRootTags=gHTMLElements[aChild].GetRootTags();
-    if(theRootTags) {
-      theParent=theRootTags->mTags[0];
-      if(CanContain(theParent,aChild)) {
-        //we've found a complete sequence, so push the parent...
-        aChild=theParent;
-        aSequence.Append((PRUnichar)theParent);
-      }
-    }
-    else break;
-  } 
-  while((theParent!=eHTMLTag_unknown) && (theParent!=aParent));
-
-  return PRBool(aParent==theParent);
-}
-
-
-/**
- *  This method allows the caller to determine if a given container
- *  is currently open
- *  
- *  @update  gess 11/9/98
- *  @param   
- *  @return  
- */
-PRBool CNavDTD::HasOpenContainer(eHTMLTags aContainer) const {
-  PRBool result=PR_FALSE;
-
-  switch(aContainer) {
-    case eHTMLTag_form:
-      result= !(~mFlags & NS_DTD_FLAG_HAS_OPEN_FORM); break;
-    case eHTMLTag_map: 
-      result=mOpenMapCount>0; break; 
-    default:
-      result=mBodyContext->HasOpenContainer(aContainer);
+    const TagList* theRootTags = gHTMLElements[aChild].GetRootTags();
+    if (!theRootTags) {
       break;
-  }
-  return result;
+    }
+
+    theParent = theRootTags->mTags[0];
+    NS_ASSERTION(CanContain(theParent, aChild),
+                 "Children must be contained by their root tags");
+
+    aChild = theParent;
+    aSequence.Append((PRUnichar)theParent);
+  } while (theParent != eHTMLTag_unknown && theParent != aParent);
+
+  return aParent == theParent;
 }
 
-/**
- *  This method allows the caller to determine if a any member
- *  in a set of tags is currently open
- *  
- *  @update  gess 11/9/98
- *  @param   
- *  @return  
- */
-PRBool CNavDTD::HasOpenContainer(const eHTMLTags aTagSet[],PRInt32 aCount) const {
-
-  int theIndex; 
-  int theTopIndex=mBodyContext->GetCount()-1;
-
-  for(theIndex=theTopIndex;theIndex>0;theIndex--){
-    if(FindTagInSet((*mBodyContext)[theIndex],aTagSet,aCount))
-      return PR_TRUE;
+PRBool CNavDTD::HasOpenContainer(eHTMLTags aContainer) const
+{
+  switch (aContainer) {
+    case eHTMLTag_form:
+      return !(~mFlags & NS_DTD_FLAG_HAS_OPEN_FORM);
+    case eHTMLTag_map:
+      return mOpenMapCount > 0;
+    default:
+      return mBodyContext->HasOpenContainer(aContainer);
   }
+}
+
+PRBool
+CNavDTD::HasOpenContainer(const eHTMLTags aTagSet[], PRInt32 aCount) const
+{
+  int theIndex;
+  int theTopIndex = mBodyContext->GetCount() - 1;
+
+  for (theIndex = theTopIndex; theIndex > 0; --theIndex) {
+    if (FindTagInSet((*mBodyContext)[theIndex], aTagSet, aCount)) {
+      return PR_TRUE;
+    }
+  }
+
   return PR_FALSE;
 }
 
-/**
- *  This method retrieves the HTMLTag type of the topmost
- *  container on the stack.
- *  
- *  @update  gess 4/2/98
- *  @return  tag id of topmost node in contextstack
- */
-eHTMLTags CNavDTD::GetTopNode() const {
+eHTMLTags
+CNavDTD::GetTopNode() const
+{
   return mBodyContext->Last();
 }
 
-/*********************************************
-  Here comes code that handles the interface
-  to our content sink.
- *********************************************/
- 
-
 /**
  * It is with great trepidation that I offer this method (privately of course).
  * The gets called whenever a container gets opened. This methods job is to 
@@ -2514,101 +2387,84 @@ eHTMLTags CNavDTD::GetTopNode() const {
  * @param   tag of the container just opened
  * @return  0 (for now)
  */
-nsresult CNavDTD::OpenTransientStyles(eHTMLTags aChildTag, PRBool aCloseInvalid){
-  nsresult result=NS_OK;
+nsresult
+CNavDTD::OpenTransientStyles(eHTMLTags aChildTag, PRBool aCloseInvalid)
+{
+  nsresult result = NS_OK;
 
   // No need to open transient styles in head context - Fix for 41427
-  if((mFlags & NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE) && 
-     eHTMLTag_newline!=aChildTag && 
-     !(mFlags & NS_DTD_FLAG_HAS_OPEN_HEAD)) {
+  if ((mFlags & NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE) &&
+      eHTMLTag_newline != aChildTag &&
+      !(mFlags & NS_DTD_FLAG_HAS_OPEN_HEAD)) {
+    if (CanContain(eHTMLTag_font, aChildTag)) {
+      PRUint32 theCount = mBodyContext->GetCount();
+      PRUint32 theLevel = theCount;
 
-#ifdef  ENABLE_RESIDUALSTYLE
-
-    if(CanContain(eHTMLTag_font,aChildTag)) {
-
-      PRUint32 theCount=mBodyContext->GetCount();
-      PRUint32 theLevel=theCount;
-
-        //this first loop is used to determine how far up the containment
-        //hierarchy we go looking for residual styles.
-      while ( 1<theLevel) {
+      // This first loop is used to determine how far up the containment
+      // hierarchy we go looking for residual styles.
+      while (1 < theLevel) {
         eHTMLTags theParentTag = mBodyContext->TagAt(--theLevel);
-        if(gHTMLElements[theParentTag].HasSpecialProperty(kNoStyleLeaksIn)) {
+        if (gHTMLElements[theParentTag].HasSpecialProperty(kNoStyleLeaksIn)) {
           break;
         }
       }
 
       mFlags &= ~NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE;
-      for(;theLevel<theCount;++theLevel){
-        nsEntryStack* theStack=mBodyContext->GetStylesAt(theLevel);
-        if(theStack){
+      for (; theLevel < theCount; ++theLevel) {
+        nsEntryStack* theStack = mBodyContext->GetStylesAt(theLevel);
+        if (theStack) {
           // Don't open transient styles if it makes the stack deep, bug 58917.
           if (theCount + theStack->mCount >= FONTSTYLE_IGNORE_DEPTH) {
             break;
           }
 
-          PRInt32 sindex=0;
+          PRInt32 sindex = 0;
 
-          nsTagEntry *theEntry=theStack->mEntries;
+          nsTagEntry *theEntry = theStack->mEntries;
           PRBool isHeadingOpen = HasOpenTagOfType(kHeading, *mBodyContext);
-          for(sindex=0;sindex<theStack->mCount;++sindex){            
-            nsCParserNode* theNode=(nsCParserNode*)theEntry->mNode;
-            if(1==theNode->mUseCount) {
-              eHTMLTags theNodeTag=(eHTMLTags)theNode->GetNodeType();
-              if(gHTMLElements[theNodeTag].CanContain(aChildTag,mDTDMode)) {
-                theEntry->mParent = theStack;  //we do this too, because this entry differs from the new one we're pushing...
-                if(isHeadingOpen) {
+          for (sindex = 0; sindex < theStack->mCount; ++sindex) {
+            nsCParserNode* theNode = (nsCParserNode*)theEntry->mNode;
+            if (1 == theNode->mUseCount) {
+              eHTMLTags theNodeTag = (eHTMLTags)theNode->GetNodeType();
+              if (gHTMLElements[theNodeTag].CanContain(aChildTag, mDTDMode)) {
+                // XXX The following comment is entirely incoherent.
+                // We do this too, because this entry differs from the new one
+                // we're pushing.
+                theEntry->mParent = theStack;
+                if (isHeadingOpen) {
                   // Bug 77352
                   // The style system needs to identify residual style tags
                   // within heading tags so that heading tags' size can take
-                  // precedence over the residual style tags' size info.. 
+                  // precedence over the residual style tags' size info..
                   // *Note: Make sure that this attribute is transient since it
                   // should not get carried over to cases other than heading.
-                  CAttributeToken theAttrToken(NS_LITERAL_STRING("_moz-rs-heading"), EmptyString());
+                  CAttributeToken theAttrToken(NS_LITERAL_STRING("_moz-rs-heading"),
+                                               EmptyString());
                   theNode->AddAttribute(&theAttrToken);
-                  result = OpenContainer(theNode,theNodeTag,theStack);
+                  result = OpenContainer(theNode, theNodeTag, theStack);
                   theNode->PopAttributeToken();
+                } else {
+                  result = OpenContainer(theNode, theNodeTag, theStack);
                 }
-                else { 
-                  result = OpenContainer(theNode,theNodeTag,theStack);
-                }
-              }
-              else if (aCloseInvalid) {
-                //if the node tag can't contain the child tag, then remove the child tag from the style stack
-                nsCParserNode* node=theStack->Remove(sindex,theNodeTag);
+              } else if (aCloseInvalid) {
+                // If the node tag can't contain the child tag, then remove the
+                // child tag from the style stack
+                nsCParserNode* node = theStack->Remove(sindex, theNodeTag);
                 IF_FREE(node, &mNodeAllocator);
-                --theEntry; //back up by one
+                --theEntry;
               }
-            } //if
+            }
             ++theEntry;
-          } //for
-        } //if
-      } //for
+          }
+        }
+      }
       mFlags |= NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE;
+    }
+  }
 
-    } //if
-
-#endif
-  }//if
   return result;
 }
 
-/**
- * It is with great trepidation that I offer this method (privately of course).
- * The gets called just prior when a container gets opened. This methods job is to 
- * take a look at the (transient) style stack, and <i>close</i> any style containers 
- * that are there. Of course, we shouldn't bother to open styles that are incompatible
- * with our parent container.
- * SEE THE TOP OF THIS FILE for more information about how the transient style stack works.
- *
- * @update  gess6/4/98
- * @param   tag of the container just opened
- * @return  0 (for now)
- */
-nsresult CNavDTD::CloseTransientStyles(eHTMLTags aChildTag){
-  return NS_OK;
-}
-
 /**
  * This method gets called when an explicit style close-tag is encountered.
  * It results in the style tag id being popped from our internal style stack.
@@ -2617,18 +2473,14 @@ nsresult CNavDTD::CloseTransientStyles(eHTMLTags aChildTag){
  * @param 
  * @return  0 if all went well (which it always does)
  */
-nsresult CNavDTD::PopStyle(eHTMLTags aTag){
-  nsresult result=0;
-
-  if(mFlags & NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE) {
-#ifdef  ENABLE_RESIDUALSTYLE
-    if(nsHTMLElement::IsResidualStyleTag(aTag)) {
-      nsCParserNode* node=mBodyContext->PopStyle(aTag);
-      IF_FREE(node, &mNodeAllocator);  
-    }
-#endif
-  } //if
-  return result;
+void
+CNavDTD::PopStyle(eHTMLTags aTag)
+{
+  if ((mFlags & NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE) &&
+      nsHTMLElement::IsResidualStyleTag(aTag)) {
+    nsCParserNode* node = mBodyContext->PopStyle(aTag);
+    IF_FREE(node, &mNodeAllocator);  
+  }
 }
 
 
@@ -2640,20 +2492,23 @@ nsresult CNavDTD::PopStyle(eHTMLTags aTag){
  * @update  gess4/22/98
  * @param   aNode -- next node to be added to model
  */
-nsresult CNavDTD::OpenHTML(const nsCParserNode *aNode){
+nsresult
+CNavDTD::OpenHTML(const nsCParserNode *aNode)
+{
   NS_PRECONDITION(mBodyContext->GetCount() >= 0, kInvalidTagStackPos);
 
   STOP_TIMER();
   MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::OpenHTML(), this=%p\n", this));
 
-  nsresult result = (mSink) ? mSink->OpenContainer(*aNode) : NS_OK; 
+  nsresult result = mSink ? mSink->OpenContainer(*aNode) : NS_OK; 
 
   MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::OpenHTML(), this=%p\n", this));
   START_TIMER();
 
-  // Don't push more than one HTML tag into the stack...
-  if (mBodyContext->GetCount() == 0) 
+  // Don't push more than one HTML tag into the stack.
+  if (mBodyContext->GetCount() == 0)  {
     mBodyContext->Push(NS_CONST_CAST(nsCParserNode*, aNode), 0, PR_FALSE); 
+  }
 
   return result;
 }
@@ -2666,14 +2521,14 @@ nsresult CNavDTD::OpenHTML(const nsCParserNode *aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-nsresult CNavDTD::OpenBody(const nsCParserNode *aNode)
+nsresult
+CNavDTD::OpenBody(const nsCParserNode *aNode)
 {
   NS_PRECONDITION(mBodyContext->GetCount() >= 0, kInvalidTagStackPos);
 
   nsresult result = NS_OK;
   
   if (!(mFlags & NS_DTD_FLAG_HAD_FRAMESET)) {
-
     mFlags |= NS_DTD_FLAG_HAD_BODY;
 
     STOP_TIMER();
@@ -2683,7 +2538,7 @@ nsresult CNavDTD::OpenBody(const nsCParserNode *aNode)
     CloseContainer(eHTMLTag_head);
 
     // Now we can open the body.
-    result = (mSink) ? mSink->OpenContainer(*aNode) : NS_OK; 
+    result = mSink ? mSink->OpenContainer(*aNode) : NS_OK; 
 
     MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::OpenBody(), this=%p\n", this));
     START_TIMER();
@@ -2712,8 +2567,8 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
                        nsEntryStack* aStyleStack)
 {
   NS_PRECONDITION(mBodyContext->GetCount() >= 0, kInvalidTagStackPos);
-  
-  nsresult   result = NS_OK; 
+
+  nsresult   result = NS_OK;
   PRBool     done   = PR_TRUE;
   PRBool     rs_tag = nsHTMLElement::IsResidualStyleTag(aTag);
   // We need to open transient styles to encompass the <li> so that the bullets
@@ -2721,22 +2576,21 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
   PRBool     li_tag = aTag == eHTMLTag_li;
 
   if (rs_tag || li_tag) {
-    /***********************************************************************
-     *  Here's an interesting problem:
+    /*
+     * Here's an interesting problem:
      *
-     *  If there's an <a> on the RS-stack, and you're trying to open 
-     *  another <a>, the one on the RS-stack should be discarded.
+     * If there's an <a> on the RS-stack, and you're trying to open
+     * another <a>, the one on the RS-stack should be discarded.
      *
-     *  I'm updating OpenTransientStyles to throw old <a>'s away.
-     *
-     ***********************************************************************/
-
-    OpenTransientStyles(aTag, !li_tag); 
+     * I'm updating OpenTransientStyles to throw old <a>'s away.
+     */
+    OpenTransientStyles(aTag, !li_tag);
   }
 
   switch (aTag) {
     case eHTMLTag_html:
-      result=OpenHTML(aNode); break;
+      result = OpenHTML(aNode);
+      break;
 
     case eHTMLTag_head:
       if (!(mFlags & NS_DTD_FLAG_HAS_OPEN_HEAD)) {
@@ -2747,12 +2601,11 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
 
     case eHTMLTag_body:
       {
-        eHTMLTags theParent=mBodyContext->Last();
+        eHTMLTags theParent = mBodyContext->Last();
         if (!gHTMLElements[aTag].IsSpecialParent(theParent)) {
           mFlags |= NS_DTD_FLAG_HAS_OPEN_BODY;
-          result = OpenBody(aNode); 
-        }
-        else {
+          result = OpenBody(aNode);
+        } else {
           done = PR_FALSE;
         }
       }
@@ -2764,7 +2617,8 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
       break;
 
     case eHTMLTag_form:
-      if (!(mFlags & NS_DTD_FLAG_HAS_OPEN_FORM)) { // discard nested forms - bug 72639
+      // Discard nested forms - bug 72639
+      if (!(mFlags & NS_DTD_FLAG_HAS_OPEN_FORM)) {
         mFlags |= NS_DTD_FLAG_HAS_OPEN_FORM;
         result = mSink ? mSink->OpenContainer(*aNode) : NS_OK;
       }
@@ -2786,27 +2640,27 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
       break;
 
     case eHTMLTag_noscript:
-      // we want to make sure that OpenContainer gets called below since we're
+      // We want to make sure that OpenContainer gets called below since we're
       // not doing it here
-      done=PR_FALSE;
-      // If the script is disabled noscript should not be
-      // in the content model until the layout can somehow
-      // turn noscript's display property to block <-- bug 67899
-      if(mFlags & NS_IPARSER_FLAG_SCRIPT_ENABLED) {
+      done = PR_FALSE;
+
+      if (mFlags & NS_IPARSER_FLAG_SCRIPT_ENABLED) {
+        // XXX This flag doesn't currently do anything (and would be
+        // insufficient if it did).
         mFlags |= NS_DTD_FLAG_ALTERNATE_CONTENT;
       }
       break;
-       
-    case eHTMLTag_iframe: // Bug 84491 
+
+    case eHTMLTag_iframe: // Bug 84491
     case eHTMLTag_noframes:
-      done=PR_FALSE;
-      if(mFlags & NS_IPARSER_FLAG_FRAMES_ENABLED) {
+      done = PR_FALSE;
+      if (mFlags & NS_IPARSER_FLAG_FRAMES_ENABLED) {
         mFlags |= NS_DTD_FLAG_ALTERNATE_CONTENT;
       }
       break;
 
     default:
-      done=PR_FALSE;
+      done = PR_FALSE;
       break;
   }
 
@@ -2814,10 +2668,11 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
     STOP_TIMER();
     MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::OpenContainer(), this=%p\n", this));
 
-    result=(mSink) ? mSink->OpenContainer(*aNode) : NS_OK; 
+    result = mSink ? mSink->OpenContainer(*aNode) : NS_OK;
 
     MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::OpenContainer(), this=%p\n", this));
     START_TIMER();
+
     // For residual style tags rs_tag will be true and hence
     // the body context will hold an extra reference to the node.
     mBodyContext->Push(NS_CONST_CAST(nsCParserNode*, aNode), aStyleStack, rs_tag); 
@@ -2866,8 +2721,9 @@ CNavDTD::CloseContainer(const eHTMLTags aTag)
     case eHTMLTag_noembed:
     case eHTMLTag_noscript:
     case eHTMLTag_noframes:
-      // switch from alternate content state to regular state
+      // Switch from alternate content state to regular state.
       mFlags &= ~NS_DTD_FLAG_ALTERNATE_CONTENT;
+
       // falling thro' intentionally....
     default:
       done = PR_FALSE;
@@ -2913,157 +2769,142 @@ CNavDTD::CloseContainer(const eHTMLTags aTag)
  * @param   aClosedByStartTag -- if TRUE, then we're closing something because a start tag caused it
  * @return  TRUE if ok, FALSE if error
  */
-nsresult CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTarget, PRBool aClosedByStartTag)
+nsresult
+CNavDTD::CloseContainersTo(PRInt32 anIndex, eHTMLTags aTarget,
+                           PRBool aClosedByStartTag)
 {
   NS_PRECONDITION(mBodyContext->GetCount() > 0, kInvalidTagStackPos);
   nsresult result = NS_OK;
-  
-  if ((anIndex<mBodyContext->GetCount()) && (anIndex>=0)) {
 
+  if (anIndex < mBodyContext->GetCount() && anIndex >= 0) {
     PRInt32 count = 0;
     while ((count = mBodyContext->GetCount()) > anIndex) {
-      nsEntryStack* theChildStyleStack = 0;      
+      nsEntryStack* theChildStyleStack = 0;
       eHTMLTags theTag = mBodyContext->Last();
       nsCParserNode* theNode = mBodyContext->Pop(theChildStyleStack);
-      result = CloseContainer(theTag);  
+      result = CloseContainer(theTag);
 
-#ifdef  ENABLE_RESIDUALSTYLE
+      PRBool theTagIsStyle = nsHTMLElement::IsResidualStyleTag(theTag);
+      // If the current tag cannot leak out then we shouldn't leak out of the target - Fix 40713
+      PRBool theStyleDoesntLeakOut = gHTMLElements[theTag].HasSpecialProperty(kNoStyleLeaksOut);
+      if (!theStyleDoesntLeakOut) {
+        theStyleDoesntLeakOut = gHTMLElements[aTarget].HasSpecialProperty(kNoStyleLeaksOut);
+      }
 
-        PRBool theTagIsStyle=nsHTMLElement::IsResidualStyleTag(theTag);
-        // If the current tag cannot leak out then we shouldn't leak out of the target - Fix 40713
-        PRBool theStyleDoesntLeakOut = gHTMLElements[theTag].HasSpecialProperty(kNoStyleLeaksOut);
-        if(!theStyleDoesntLeakOut) {
-          theStyleDoesntLeakOut = gHTMLElements[aTarget].HasSpecialProperty(kNoStyleLeaksOut);
+      // Do not invoke residual style handling when dealing with
+      // alternate content. This fixed bug 25214.
+      if (theTagIsStyle && !(mFlags & NS_DTD_FLAG_ALTERNATE_CONTENT)) {
+        NS_ASSERTION(theNode, "residual style node should not be null");
+        if (!theNode) {
+          if (theChildStyleStack) {
+            mBodyContext->PushStyles(theChildStyleStack);
+          }
+          return NS_OK;
         }
-      
-        /*************************************************************
-          Do not invoke residual style handling when dealing with
-          alternate content. This fixes bug 25214.
-         *************************************************************/
 
-        if(theTagIsStyle && !(mFlags & NS_DTD_FLAG_ALTERNATE_CONTENT)) {
-          NS_ASSERTION(theNode, "residual style node should not be null");
-          if (!theNode) {
-            if (theChildStyleStack)
-              mBodyContext->PushStyles(theChildStyleStack);
-            return NS_OK;
-          }
-          PRBool theTargetTagIsStyle = nsHTMLElement::IsResidualStyleTag(aTarget);
-          if(aClosedByStartTag) { 
-
-            /***********************************************************
-              Handle closure due to new start tag.          
-
-              The cases we're handing here:
-                1. <body><b><DIV>       //<b> gets pushed onto <body>.mStyles.
-                2. <body><a>text<a>     //in this case, the target matches, so don't push style
-             ***************************************************************************/
-
-            if (theNode->mUseCount == 0){
-              if (theTag != aTarget) {
-                  //don't push if thechild==theTarget
-                if (theChildStyleStack)
-                  theChildStyleStack->PushFront(theNode);
-                else 
-                  mBodyContext->PushStyle(theNode);
-              }
-            } 
-            else if (theTag == aTarget && !gHTMLElements[aTarget].CanContainSelf()) {
-              //here's a case we missed:  <a><div>text<a>text</a></div>
-              //The <div> pushes the 1st <a> onto the rs-stack, then the 2nd <a>
-              //pops the 1st <a> from the rs-stack altogether.
-              nsCParserNode* node = mBodyContext->PopStyle(theTag);
-              IF_FREE(node, &mNodeAllocator);
-            }
-
-            if (theChildStyleStack) {
-              mBodyContext->PushStyles(theChildStyleStack);
-            }
-          }
-          else { //Handle closure due to another close tag.      
-
-            /***********************************************************             
-              if you're here, then we're dealing with the closure of tags
-              caused by a close tag (as opposed to an open tag).
-              At a minimum, we should consider pushing residual styles up 
-              up the stack or popping and recycling displaced nodes.
-
-              Known cases: 
-                1. <body><b><div>text</DIV> 
-                      Here the <b> will leak into <div> (see case given above), and 
-                      when <div> closes the <b> is dropped since it's already residual.
-
-                2. <body><div><b>text</div>
-                      Here the <b> will leak out of the <div> and get pushed onto
-                      the RS stack for the <body>, since it originated in the <div>.
-
-                3. <body><span><b>text</span>
-                      In this case, the the <b> get's pushed onto the style stack.
-                      Later we deal with RS styles stored on the <span>
-
-                4. <body><span><b>text</i>
-                      Here we the <b>is closed by a (synonymous) style tag. 
-                      In this case, the <b> is simply closed.
-             ***************************************************************************/
-
-            if (theChildStyleStack) {
-              if (!theStyleDoesntLeakOut) {
-                if (theTag != aTarget) {
-                  if (theNode->mUseCount == 0) {
-                    theChildStyleStack->PushFront(theNode);
-                  }
-                }
-                else if (theNode->mUseCount == 1) {
-                  // This fixes bug 30885,29626.
-                  // Make sure that the node, which is about to
-                  // get released does not stay on the style stack...
-                  // Also be sure to remove the correct style off the
-                  // style stack. -  Ref. bug 94208.
-                  // Ex <FONT><B><I></FONT><FONT></B></I></FONT>
-                  // Make sure that </B> removes B off the style stack.
-                  mBodyContext->RemoveStyle(theTag);
-                }
-                mBodyContext->PushStyles(theChildStyleStack);
-              }
-              else{
-                IF_DELETE(theChildStyleStack,&mNodeAllocator);
-              }
-            }
-            else if (theNode->mUseCount == 0) {
-
-              //The old version of this only pushed if the targettag wasn't style.
-              //But that misses this case: <font><b>text</font>, where the b should leak
-              if (aTarget != theTag) {
+        PRBool theTargetTagIsStyle = nsHTMLElement::IsResidualStyleTag(aTarget);
+        if (aClosedByStartTag) {
+          // Handle closure due to new start tag.
+          // The cases we're handing here:
+          // 1. <body><b><DIV>       //<b> gets pushed onto <body>.mStyles.
+          // 2. <body><a>text<a>     //in this case, the target matches, so don't push style
+          if (theNode->mUseCount == 0) {
+            if (theTag != aTarget) {
+              if (theChildStyleStack) {
+                theChildStyleStack->PushFront(theNode);
+              } else {
                 mBodyContext->PushStyle(theNode);
               }
-            } 
-            else {
-              //Ah, at last, the final case. If you're here, then we just popped a 
-              //style tag that got onto that tag stack from a stylestack somewhere.
-              //Pop it from the stylestack if the target is also a style tag.
-              //Make sure to remove the matching style. In the following example
-              //<FONT><B><I></FONT><FONT color=red></B></I></FONT> make sure that 
-              //</I> does not remove <FONT color=red> off the style stack. - bug 94208
-              if (theTargetTagIsStyle && theTag == aTarget) {
+            }
+          } else if (theTag == aTarget && !gHTMLElements[aTarget].CanContainSelf()) {
+            //here's a case we missed:  <a><div>text<a>text</a></div>
+            //The <div> pushes the 1st <a> onto the rs-stack, then the 2nd <a>
+            //pops the 1st <a> from the rs-stack altogether.
+            nsCParserNode* node = mBodyContext->PopStyle(theTag);
+            IF_FREE(node, &mNodeAllocator);
+          }
+
+          if (theChildStyleStack) {
+            mBodyContext->PushStyles(theChildStyleStack);
+          }
+        } else {
+          /*
+           * if you're here, then we're dealing with the closure of tags
+           * caused by a close tag (as opposed to an open tag).
+           * At a minimum, we should consider pushing residual styles up
+           * up the stack or popping and recycling displaced nodes.
+           *
+           * Known cases:
+           * 1. <body><b><div>text</DIV>
+           * Here the <b> will leak into <div> (see case given above), and
+           * when <div> closes the <b> is dropped since it's already residual.
+           *
+           * 2. <body><div><b>text</div>
+           * Here the <b> will leak out of the <div> and get pushed onto
+           * the RS stack for the <body>, since it originated in the <div>.
+           *
+           * 3. <body><span><b>text</span>
+           * In this case, the the <b> get's pushed onto the style stack.
+           * Later we deal with RS styles stored on the <span>
+           *
+           * 4. <body><span><b>text</i>
+           * Here we the <b>is closed by a (synonymous) style tag.
+           * In this case, the <b> is simply closed.
+           */
+          if (theChildStyleStack) {
+            if (!theStyleDoesntLeakOut) {
+              if (theTag != aTarget) {
+                if (theNode->mUseCount == 0) {
+                  theChildStyleStack->PushFront(theNode);
+                }
+              } else if (theNode->mUseCount == 1) {
+                // This fixes bug 30885,29626.
+                // Make sure that the node, which is about to
+                // get released does not stay on the style stack...
+                // Also be sure to remove the correct style off the
+                // style stack. -  Ref. bug 94208.
+                // Ex <FONT><B><I></FONT><FONT></B></I></FONT>
+                // Make sure that </B> removes B off the style stack.
                 mBodyContext->RemoveStyle(theTag);
               }
+              mBodyContext->PushStyles(theChildStyleStack);
+            } else{
+              IF_DELETE(theChildStyleStack, &mNodeAllocator);
+            }
+          } else if (theNode->mUseCount == 0) {
+            // The old version of this only pushed if the targettag wasn't
+            // style.  But that misses this case: <font><b>text</font>, where
+            // the b should leak.
+            if (aTarget != theTag) {
+              mBodyContext->PushStyle(theNode);
+            }
+          } else {
+            // Ah, at last, the final case. If you're here, then we just popped
+            // a style tag that got onto that tag stack from a stylestack
+            // somewhere.  Pop it from the stylestack if the target is also a
+            // style tag.  Make sure to remove the matching style. In the
+            // following example:
+            // <FONT><B><I></FONT><FONT color=red></B></I></FONT>
+            // make sure that </I> does not remove
+            // <FONT color=red> off the style stack. - bug 94208
+            if (theTargetTagIsStyle && theTag == aTarget) {
+              mBodyContext->RemoveStyle(theTag);
             }
           }
-        } //if
-        else { 
-          //the tag is not a style tag...
-          if (theChildStyleStack) {
-            if (theStyleDoesntLeakOut)
-              IF_DELETE(theChildStyleStack,&mNodeAllocator);
-            else 
-              mBodyContext->PushStyles(theChildStyleStack);
+        }
+      } else {
+        // The tag is not a style tag.
+        if (theChildStyleStack) {
+          if (theStyleDoesntLeakOut) {
+            IF_DELETE(theChildStyleStack, &mNodeAllocator);
+          } else {
+            mBodyContext->PushStyles(theChildStyleStack);
           }
         }
-#endif
-        IF_FREE(theNode, &mNodeAllocator);
+      }
+      IF_FREE(theNode, &mNodeAllocator);
     }
-
-  } //if
+  }
   return result;
 }
 
@@ -3076,43 +2917,45 @@ nsresult CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTarget, PRBool aC
  * @param   aClosedByStartTag -- ONLY TRUE if the container is being closed by opening of another container.
  * @return  TRUE if ok, FALSE if error
  */
-nsresult CNavDTD::CloseContainersTo(eHTMLTags aTag,PRBool aClosedByStartTag){
+nsresult
+CNavDTD::CloseContainersTo(eHTMLTags aTag, PRBool aClosedByStartTag)
+{
   NS_PRECONDITION(mBodyContext->GetCount() > 0, kInvalidTagStackPos);
 
-  PRInt32 pos=mBodyContext->LastOf(aTag);
+  PRInt32 pos = mBodyContext->LastOf(aTag);
 
-  if(kNotFound!=pos) {
-    //the tag is indeed open, so close it.
-    return CloseContainersTo(pos,aTag,aClosedByStartTag);
+  if (kNotFound != pos) {
+    // The tag is indeed open, so close it.
+    return CloseContainersTo(pos, aTag, aClosedByStartTag);
   }
 
-  eHTMLTags theTopTag=mBodyContext->Last();
+  eHTMLTags theTopTag = mBodyContext->Last();
 
-  PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTag)) && (nsHTMLElement::IsResidualStyleTag(theTopTag)));
-  if(!theTagIsSynonymous){
-    theTagIsSynonymous=(gHTMLElements[aTag].IsMemberOf(kHeading) && 
-                        gHTMLElements[theTopTag].IsMemberOf(kHeading));  
-  }
+  PRBool theTagIsSynonymous = (nsHTMLElement::IsResidualStyleTag(aTag) &&
+                               nsHTMLElement::IsResidualStyleTag(theTopTag)) ||
+                              (gHTMLElements[aTag].IsMemberOf(kHeading) &&
+                               gHTMLElements[theTopTag].IsMemberOf(kHeading));
 
-  if(theTagIsSynonymous) {
-    //if you're here, it's because we're trying to close one tag,
-    //but a different (synonymous) one is actually open. Because this is NAV4x
-    //compatibililty mode, we must close the one that's really open.
-    aTag=theTopTag;    
-    pos=mBodyContext->LastOf(aTag);
-    if(kNotFound!=pos) {
-      //the tag is indeed open, so close it.
-      return CloseContainersTo(pos,aTag,aClosedByStartTag);
+  if (theTagIsSynonymous) {
+    // If you're here, it's because we're trying to close one tag,
+    // but a different (synonymous) one is actually open. Because this is NAV4x
+    // compatibililty mode, we must close the one that's really open.
+    aTag = theTopTag;
+    pos = mBodyContext->LastOf(aTag);
+    if (kNotFound != pos) {
+      // The tag is indeed open, so close it.
+      return CloseContainersTo(pos, aTag, aClosedByStartTag);
     }
   }
-  
-  nsresult result=NS_OK;
-  const TagList* theRootTags=gHTMLElements[aTag].GetRootTags();
-  eHTMLTags theParentTag=(theRootTags) ? theRootTags->mTags[0] : eHTMLTag_unknown;
-  pos=mBodyContext->LastOf(theParentTag);
-  if(kNotFound!=pos) {
-    //the parent container is open, so close it instead
-    result=CloseContainersTo(pos+1,aTag,aClosedByStartTag);
+
+  nsresult result = NS_OK;
+  const TagList* theRootTags = gHTMLElements[aTag].GetRootTags();
+  // XXX Can we just bail if !theRootTags? Does that ever happen?
+  eHTMLTags theParentTag = theRootTags ? theRootTags->mTags[0] : eHTMLTag_unknown;
+  pos = mBodyContext->LastOf(theParentTag);
+  if (kNotFound != pos) {
+    // The parent container is open, so close it instead
+    result = CloseContainersTo(pos + 1, aTag, aClosedByStartTag);
   }
   return result;
 }
@@ -3125,22 +2968,24 @@ nsresult CNavDTD::CloseContainersTo(eHTMLTags aTag,PRBool aClosedByStartTag){
  * @param   aNode -- next node to be added to model
  * @return  error code; 0 means OK
  */
-nsresult CNavDTD::AddLeaf(const nsIParserNode *aNode){
-  nsresult result=NS_OK;
-  
-  if(mSink){
-    eHTMLTags theTag=(eHTMLTags)aNode->GetNodeType();
-    OpenTransientStyles(theTag); 
+nsresult
+CNavDTD::AddLeaf(const nsIParserNode *aNode)
+{
+  nsresult result = NS_OK;
+
+  if (mSink) {
+    eHTMLTags theTag = (eHTMLTags)aNode->GetNodeType();
+    OpenTransientStyles(theTag);
 
     STOP_TIMER();
     MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
-    
-    result=mSink->AddLeaf(*aNode);
+
+    result = mSink->AddLeaf(*aNode);
 
     MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
     START_TIMER();
-
   }
+
   return result;
 }
 
@@ -3152,22 +2997,24 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode *aNode){
  * @param   aNode -- next node to be added to model
  * @return  error code; 0 means OK
  */
-nsresult CNavDTD::AddHeadContent(nsIParserNode *aNode){
-  nsresult result=NS_OK;
+nsresult
+CNavDTD::AddHeadContent(nsIParserNode *aNode)
+{
+  nsresult result = NS_OK;
 
-  static eHTMLTags gNoXTags[] = {eHTMLTag_noembed,eHTMLTag_noframes};
+  static eHTMLTags gNoXTags[] = { eHTMLTag_noembed, eHTMLTag_noframes };
 
   eHTMLTags theTag = (eHTMLTags)aNode->GetNodeType();
-  
+
   // XXX - SCRIPT inside NOTAGS should not get executed unless the pref.
   // says so.  Since we don't have this support yet..lets ignore the
   // SCRIPT inside NOTAGS.  Ref Bug 25880.
   if (eHTMLTag_meta == theTag || eHTMLTag_script == theTag) {
-    if (HasOpenContainer(gNoXTags,sizeof(gNoXTags)/sizeof(eHTMLTag_unknown))) {
+    if (HasOpenContainer(gNoXTags, NS_ARRAY_LENGTH(gNoXTags))) {
       return result;
     }
   }
-  
+
   if (mSink) {
     STOP_TIMER();
     MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::AddHeadContent(), this=%p\n", this));
@@ -3186,8 +3033,7 @@ nsresult CNavDTD::AddHeadContent(nsIParserNode *aNode){
         // Close the head now so that body content doesn't get sucked into it.
         CloseContainer(eHTMLTag_head);
       }
-    }
-    else {
+    } else {
       if ((mFlags & NS_DTD_FLAG_HAS_MAIN_CONTAINER) &&
           mHeadContainerPosition == -1) {
         // Keep track of this so that we know when to close the head, when
@@ -3205,75 +3051,59 @@ nsresult CNavDTD::AddHeadContent(nsIParserNode *aNode){
     MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::AddHeadContent(), this=%p\n", this));
     START_TIMER();
   }
+
   return result;
 }
 
-/**
- *  This method gets called to create a valid context stack
- *  for the given child. We compare the current stack to the
- *  default needs of the child, and push new guys onto the
- *  stack until the child can be properly placed.
- *
- *  @update  gess 4/8/98
- *  @param   aChild is the child for whom we need to 
- *           create a new context vector
- *  @return  true if we succeeded, otherwise false
- */
-nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChild){
-  
+void
+CNavDTD::CreateContextStackFor(eHTMLTags aChild)
+{
   mScratch.Truncate();
-  
-  nsresult  result=(nsresult)kContextMismatch;
-  eHTMLTags theTop=mBodyContext->Last();
-  PRBool    bResult=ForwardPropagate(mScratch,theTop,aChild);
-  
-  if(PR_FALSE==bResult){
 
-    if(eHTMLTag_unknown!=theTop) {
-      if(theTop!=aChild) //dont even bother if we're already inside a similar element...
-        bResult=BackwardPropagate(mScratch,theTop,aChild);      
-    } //if
-    else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChild);
-  } //elseif
+  eHTMLTags theTop = mBodyContext->Last();
+  PRBool    result = ForwardPropagate(mScratch, theTop, aChild);
 
-  PRInt32   theLen=mScratch.Length();
-  eHTMLTags theTag=(eHTMLTags)mScratch[--theLen];
+  if (!result) {
+    if (eHTMLTag_unknown == theTop) {
+      result = BackwardPropagate(mScratch, eHTMLTag_html, aChild);
+    } else if (theTop != aChild) {
+      // Dont even bother if we're already inside a similar element...
+      result = BackwardPropagate(mScratch, theTop, aChild);
+    }
+  }
 
-  if((0==mBodyContext->GetCount()) || (mBodyContext->Last()==theTag))
-    result=NS_OK;
+  if (!result) {
+    return;
+  }
 
-  //now, build up the stack according to the tags 
-  //you have that aren't in the stack...
-  if(PR_TRUE==bResult){
-    while(theLen) {
-      theTag=(eHTMLTags)mScratch[--theLen];
+  PRInt32   theLen = mScratch.Length();
+  eHTMLTags theTag = (eHTMLTags)mScratch[--theLen];
+
+  // Now, build up the stack according to the tags.
+  while (theLen) {
+    theTag = (eHTMLTags)mScratch[--theLen];
 
 #ifdef ALLOW_TR_AS_CHILD_OF_TABLE
-      if((eHTML3_Quirks==mDocType) && (eHTMLTag_tbody==theTag)) {
-        //the prev. condition prevents us from emitting tbody in html3.2 docs; fix bug 30378
-        continue;
-      }
-#endif
-      CStartToken *theToken=(CStartToken*)mTokenAllocator->CreateTokenOfType(eToken_start,theTag);
-      HandleToken(theToken,mParser);  //these should all wind up on contextstack, so don't recycle.
+    if (eHTML3_Quirks == mDocType && eHTMLTag_tbody == theTag) {
+      // The prev. condition prevents us from emitting tbody in html3.2 docs; fix bug 30378
+      continue;
     }
-    result=NS_OK;
+#endif
+
+    // Note: These tokens should all wind up on contextstack, so don't recycle
+    // them.
+    CToken *theToken = mTokenAllocator->CreateTokenOfType(eToken_start, theTag);
+    HandleToken(theToken, mParser);
   }
-  return result;
 }
 
-/**
- * 
- * @update  gess5/18/98
- * @param 
- * @return
- */
-nsresult CNavDTD::WillResumeParse(nsIContentSink* aSink){
-
+nsresult
+CNavDTD::WillResumeParse(nsIContentSink* aSink)
+{
   STOP_TIMER();
   MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::WillResumeParse(), this=%p\n", this));
 
-  nsresult result=(aSink) ? aSink->WillResume() : NS_OK; 
+  nsresult result = aSink ? aSink->WillResume() : NS_OK;
 
   MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::WillResumeParse(), this=%p\n", this));
   START_TIMER();
@@ -3281,18 +3111,13 @@ nsresult CNavDTD::WillResumeParse(nsIContentSink* aSink){
   return result;
 }
 
-/**
- * This method gets called when the parsing process is interrupted
- * due to lack of data (waiting for netlib).
- * @update  gess5/18/98
- * @return  error code
- */
-nsresult CNavDTD::WillInterruptParse(nsIContentSink* aSink){
-
+nsresult
+CNavDTD::WillInterruptParse(nsIContentSink* aSink)
+{
   STOP_TIMER();
   MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::WillInterruptParse(), this=%p\n", this));
 
-  nsresult result=(aSink) ? aSink->WillInterrupt() : NS_OK; 
+  nsresult result = aSink ? aSink->WillInterrupt() : NS_OK;
 
   MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::WillInterruptParse(), this=%p\n", this));
   START_TIMER();
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.h b/mozilla/parser/htmlparser/src/CNavDTD.h
index 5730794d2c5..7fe9935b80a 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.h
+++ b/mozilla/parser/htmlparser/src/CNavDTD.h
@@ -38,21 +38,20 @@
 
 /**
  * MODULE NOTES:
- * @update  gess 7/15/98
  *
  * NavDTD is an implementation of the nsIDTD interface.
  * In particular, this class captures the behaviors of the original 
  * Navigator parser productions.
  *
  * This DTD, like any other in NGLayout, provides a few basic services:
- *	- First, the DTD collaborates with the Parser class to convert plain 
+ *  - First, the DTD collaborates with the Parser class to convert plain 
  *    text into a sequence of HTMLTokens. 
- *	- Second, the DTD describes containment rules for known elements. 
- *	- Third the DTD controls and coordinates the interaction between the
- *	  parsing system and content sink. (The content sink is the interface
+ *  - Second, the DTD describes containment rules for known elements. 
+ *  - Third the DTD controls and coordinates the interaction between the
+ *    parsing system and content sink. (The content sink is the interface
  *    that serves as a proxy for content model).
- *	- Fourth the DTD maintains an internal style-stack to handle residual (leaky)
- *	  style tags.
+ *  - Fourth the DTD maintains an internal style-stack to handle residual (leaky)
+ *    style tags.
  *
  * You're most likely working in this class file because
  * you want to add or change a behavior inherent in this DTD. The remainder
@@ -60,35 +59,35 @@
  * change you want in this DTD.
  *
  * RESIDUAL-STYLE HANDLNG:
- *	 There are a number of ways to represent style in an HTML document.
- *		1) explicit style tags (<B>, <I> etc)
- *		2) implicit styles (like those implicit in <Hn>)
- *		3) CSS based styles
+ *   There are a number of ways to represent style in an HTML document.
+ *    1) explicit style tags (<B>, <I> etc)
+ *    2) implicit styles (like those implicit in <Hn>)
+ *    3) CSS based styles
  *
- *	 Residual style handling results from explicit style tags that are
- *	 not closed. Consider this example: <p>text <b>bold </p>
- *	 When the <p> tag closes, the <b> tag is NOT automatically closed.
- *	 Unclosed style tags are handled by the process we call residual-style 
- *	 tag handling. 
+ *   Residual style handling results from explicit style tags that are
+ *   not closed. Consider this example: <p>text <b>bold </p>
+ *   When the <p> tag closes, the <b> tag is NOT automatically closed.
+ *   Unclosed style tags are handled by the process we call residual-style 
+ *   tag handling. 
  *
- *	 There are two aspects to residual style tag handling. The first is the 
- *	 construction and managing of a stack of residual style tags. The 
- *	 second is the automatic emission of residual style tags onto leaf content
- *	 in subsequent portions of the document.This step is necessary to propagate
- *	 the expected style behavior to subsequent portions of the document.
+ *   There are two aspects to residual style tag handling. The first is the 
+ *   construction and managing of a stack of residual style tags. The 
+ *   second is the automatic emission of residual style tags onto leaf content
+ *   in subsequent portions of the document.This step is necessary to propagate
+ *   the expected style behavior to subsequent portions of the document.
  *
- *	 Construction and managing the residual style stack is an inline process that
- *	 occurs during the model building phase of the parse process. During the model-
- *	 building phase of the parse process, a content stack is maintained which tracks
- *	 the open container hierarchy. If a style tag(s) fails to be closed when a normal
- *	 container is closed, that style tag is placed onto the residual style stack. If
- *	 that style tag is subsequently closed (in most contexts), it is popped off the
- *	 residual style stack -- and are of no further concern.
+ *   Construction and managing the residual style stack is an inline process that
+ *   occurs during the model building phase of the parse process. During the model-
+ *   building phase of the parse process, a content stack is maintained which tracks
+ *   the open container hierarchy. If a style tag(s) fails to be closed when a normal
+ *   container is closed, that style tag is placed onto the residual style stack. If
+ *   that style tag is subsequently closed (in most contexts), it is popped off the
+ *   residual style stack -- and are of no further concern.
  *
- *	 Residual style tag emission occurs when the style stack is not empty, and leaf
- *	 content occurs. In our earlier example, the <b> tag "leaked" out of the <p> 
- *	 container. Just before the next leaf is emitted (in this or another container) the 
- *	 style tags that are on the stack are emitted in succession. These same residual
+ *   Residual style tag emission occurs when the style stack is not empty, and leaf
+ *   content occurs. In our earlier example, the <b> tag "leaked" out of the <p> 
+ *   container. Just before the next leaf is emitted (in this or another container) the 
+ *   style tags that are on the stack are emitted in succession. These same residual
  *   style tags get closed automatically when the leaf's container closes, or if a
  *   child container is opened.
  * 
@@ -135,137 +134,161 @@ class nsTokenAllocator;
 
 class CNavDTD : public nsIDTD
 {
-
 #ifdef _MSC_VER
 #pragma warning( default : 4275 )
 #endif
 
 public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIDTD
-     
     /**
-      *  Common constructor for navdtd. You probably want to call
-      *  NS_NewNavHTMLDTD().
-      *
-      *  @update  gess 7/9/98
-      */
+     *  Common constructor for navdtd. You probably want to call
+     *  NS_NewNavHTMLDTD().
+     */
     CNavDTD();
     virtual ~CNavDTD();
-    
 
+    /**
+     * This method is offered publically for the sole use from
+     * nsParser::ParseFragment. In general, you should prefer to use methods
+     * that are directly on nsIDTD, since those will be guaranteed to do the
+     * right thing.
+     *
+     * @param aNode The parser node that contains the token information for
+     *              this tag.
+     * @param aTag The actual tag that is being opened (should correspond to
+     *             aNode.
+     * @param aStyleStack The style stack that aNode might be a member of
+     *                    (usually null).
+     */
+    nsresult OpenContainer(const nsCParserNode *aNode,
+                           eHTMLTags aTag,
+                           nsEntryStack* aStyleStack = nsnull);
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIDTD
+
+private:
     /**
      *  This method is called to determine whether or not a tag
      *  of one type can contain a tag of another type.
      *  
-     *  @update  gess 3/25/98
-     *  @param   aParent -- int tag of parent container
-     *  @param   aChild -- int tag of child container
+     *  @param   aParent Tag of parent container
+     *  @param   aChild Tag of child container
      *  @return  PR_TRUE if parent can contain child
      */
-    virtual PRBool CanPropagate(eHTMLTags aParent,
-                                eHTMLTags aChild,
-                                PRBool aParentContains) ;
+    PRBool CanPropagate(eHTMLTags aParent,
+                        eHTMLTags aChild,
+                        PRBool aParentContains);
 
     /**
      *  This method gets called to determine whether a given 
      *  child tag can be omitted by the given parent.
      *  
-     *  @update  gess 3/25/98
-     *  @param   aParent -- parent tag being asked about omitting given child
-     *  @param   aChild -- child tag being tested for omittability by parent
-     *  @param   aParentContains -- can be 0,1,-1 (false,true, unknown)
+     *  @param   aParent Parent tag being asked about omitting given child
+     *  @param   aChild Child tag being tested for omittability by parent
+     *  @param   aParentContains Can be 0,1,-1 (false,true, unknown)
+     *                           XXX should be PRInt32, not PRBool
      *  @return  PR_TRUE if given tag can be omitted
      */
-    virtual PRBool CanOmit(eHTMLTags aParent, 
-                           eHTMLTags aChild,
-                           PRBool& aParentContains);
+    PRBool CanOmit(eHTMLTags aParent, 
+                   eHTMLTags aChild,
+                   PRBool& aParentContains);
 
     /**
-     * This method tries to design a context map (without actually
-     * changing our parser state) from the parent down to the
-     * child. 
+     * Looking at aParent, try to see if we can propagate from aChild to
+     * aParent. If aParent is a TR tag, then see if we can start at TD instead
+     * of at aChild.
      *
-     * @update  gess4/6/98
-     * @param   aParent -- tag type of parent
-     * @param   aChild -- tag type of child
-     * @return  True if closure was achieved -- other false
+     * @param   aParent Tag type of parent
+     * @param   aChild Tag type of child
+     * @return  PR_TRUE if closure was achieved -- otherwise false
      */
-    virtual PRBool ForwardPropagate(nsString& aSequence,
-                                    eHTMLTags aParent,
-                                    eHTMLTags aChild);
+    PRBool ForwardPropagate(nsString& aSequence,
+                            eHTMLTags aParent,
+                            eHTMLTags aChild);
 
     /**
-     * This method tries to design a context map (without actually
-     * changing our parser state) from the child up to the parent.
+     * Given aParent that does not contain aChild, starting with aChild's
+     * first root tag, try to find aParent. If we can reach aParent simply by
+     * going up each first root tag, then return true. Otherwise, we could not
+     * propagate from aChild up to aParent, so return false.
      *
-     * @update  gess4/6/98
-     * @param   aParent -- tag type of parent
-     * @param   aChild -- tag type of child
-     * @return  True if closure was achieved -- other false
+     * @param   aParent Tag type of parent
+     * @param   aChild Tag type of child
+     * @return  PR_TRUE if closure was achieved -- other false
      */
-    virtual PRBool BackwardPropagate(nsString& aSequence,
-                                     eHTMLTags aParent,
-                                     eHTMLTags aChild) const;
+    PRBool BackwardPropagate(nsString& aSequence,
+                             eHTMLTags aParent,
+                             eHTMLTags aChild) const;
 
     /**
-     * Attempt forward and/or backward propagation for the given
-     * child within the current context vector stack.
-     * @update	gess5/11/98
-     * @param   aChild -- type of child to be propagated.
-     * @return  TRUE if succeeds, otherwise FALSE
+     * Attempt forward and/or backward propagation for the given child within
+     * the current context vector stack. And actually open the required tags.
+     *
+     * @param   aChild Type of child to be propagated.
      */
-    nsresult CreateContextStackFor(eHTMLTags aChild);
+    void CreateContextStackFor(eHTMLTags aChild);
 
     /**
-     * Ask parser if a given container is open ANYWHERE on stack
-     * @update	gess5/11/98
+     * Ask if a given container is open anywhere on its stack
+     *
      * @param   id of container you want to test for
      * @return  TRUE if the given container type is open -- otherwise FALSE
      */
-    virtual PRBool HasOpenContainer(eHTMLTags aContainer) const;
+    PRBool HasOpenContainer(eHTMLTags aContainer) const;
 
     /**
-     * Ask parser if a given container is open ANYWHERE on stack
-     * @update	gess5/11/98
-     * @param   id of container you want to test for
-     * @return  TRUE if the given container type is open -- otherwise FALSE
-     */
-    virtual PRBool HasOpenContainer(const eHTMLTags aTagSet[],PRInt32 aCount) const;
-
-    /**
-     * Accessor that retrieves the tag type of the topmost item on context 
-     * vector stack.
+     * This method allows the caller to determine if a any member
+     * in a set of tags is currently open.
      *
-     * @update	gess5/11/98
-     * @return  tag type (may be unknown)
+     * @param   aTagSet A set of tags you care about.
+     * @return  PR_TRUE if any of the members of aTagSet are currently open.
      */
-    virtual eHTMLTags GetTopNode() const;
+    PRBool HasOpenContainer(const eHTMLTags aTagSet[], PRInt32 aCount) const;
+
+    /**
+     * Accessor that retrieves the tag type of the topmost item on the DTD's
+     * tag stack.
+     *
+     * @return The tag type (may be unknown)
+     */
+    eHTMLTags GetTopNode() const;
 
     /**
      * Finds the topmost occurance of given tag within context vector stack.
-     * @update	gess5/11/98
+     *
      * @param   tag to be found
      * @return  index of topmost tag occurance -- may be -1 (kNotFound).
      */
-    // virtual PRInt32 GetTopmostIndexOf(eHTMLTags aTag) const;
+    PRInt32 LastOf(eHTMLTags aTagSet[], PRInt32 aCount) const;
 
     /**
-     * Finds the topmost occurance of given tag within context vector stack.
-     * @update	gess5/11/98
-     * @param   tag to be found
-     * @return  index of topmost tag occurance -- may be -1 (kNotFound).
-     */
-    virtual PRInt32 LastOf(eHTMLTags aTagSet[],PRInt32 aCount) const;
-
-    /**
-     * The following set of methods are used to partially construct 
-     * the content model (via the sink) according to the type of token.
-     * @update	gess5/11/98
-     * @param   aToken is the token (of a given type) to be handled
-     * @return  error code representing construction state; usually 0.
+     *  This method gets called when a start token has been
+     *  encountered in the parse process. If the current container
+     *  can contain this tag, then add it. Otherwise, you have
+     *  two choices: 1) create an implicit container for this tag
+     *                  to be stored in
+     *               2) close the top container, and add this to
+     *                  whatever container ends up on top.
+     *
+     *  @param   aToken -- next (start) token to be handled
+     *  @return  Whether or not we should block the parser.
      */
     nsresult    HandleStartToken(CToken* aToken);
+
+    /** 
+     *  This method gets called when a start token has been 
+     *  encountered in the parse process. If the current container
+     *  can contain this tag, then add it. Otherwise, you have
+     *  two choices: 1) create an implicit container for this tag
+     *                  to be stored in
+     *               2) close the top container, and add this to
+     *                  whatever container ends up on top.
+     *   
+     *  @param   aToken Next (start) token to be handled.
+     *  @param   aChildTag The tag corresponding to aToken.
+     *  @param   aNode CParserNode representing this start token
+     *  @return  A potential request to block the parser.
+     */
     nsresult    HandleDefaultStartToken(CToken* aToken, eHTMLTags aChildTag,
                                         nsCParserNode *aNode);
     nsresult    HandleEndToken(CToken* aToken);
@@ -277,34 +300,12 @@ public:
     nsresult    BuildNeglectedTarget(eHTMLTags aTarget, eHTMLTokenTypes aType,
                                      nsIParser* aParser, nsIContentSink* aSink);
 
-    //*************************************************
-    //these cover methods mimic the sink, and are used
-    //by the parser to manage its context-stack.
-    //*************************************************
-
-    /**
-     * The next set of method open given HTML elements of
-     * various types.
-     * 
-     * @update	gess5/11/98
-     * @param   node to be opened in content sink.
-     * @return  error code representing error condition-- usually 0.
-     */
     nsresult OpenHTML(const nsCParserNode *aNode);
     nsresult OpenBody(const nsCParserNode *aNode);
-    nsresult OpenContainer(const nsCParserNode *aNode,
-                           eHTMLTags aTag,
-                           nsEntryStack* aStyleStack=0);
 
-    /**
-     * Close head element if it is open.
-     */
-    nsresult CloseHead();
-    
     /**
      * The special purpose methods automatically close
      * one or more open containers.
-     * @update	gess5/11/98
      * @return  error code - 0 if all went well.
      */
     nsresult CloseContainer(const eHTMLTags aTag);
@@ -316,7 +317,6 @@ public:
 
     /**
      * Causes leaf to be added to sink at current vector pos.
-     * @update	gess5/11/98
      * @param   aNode is leaf node to be added.
      * @return  error code - 0 if all went well.
      */
@@ -328,14 +328,12 @@ public:
      * transient styles that occur as a result of poorly formed HTML
      * or bugs in the original navigator.
      *
-     * @update	gess5/11/98
      * @param   aTag -- represents the transient style tag to be handled.
      * @return  error code -- usually 0
      */
     nsresult  OpenTransientStyles(eHTMLTags aChildTag,
                                   PRBool aCloseInvalid = PR_TRUE);
-    nsresult  CloseTransientStyles(eHTMLTags aChildTag);
-    nsresult  PopStyle(eHTMLTags aTag);
+    void      PopStyle(eHTMLTags aTag);
 
     nsresult  PushIntoMisplacedStack(CToken* aToken)
     {
@@ -349,9 +347,31 @@ public:
 protected:
 
     nsresult        CollectAttributes(nsIParserNode* aNode,eHTMLTags aTag,PRInt32 aCount);
+
+    /**
+     * This gets called before we've handled a given start tag.
+     * It's a generic hook to let us do pre processing.
+     *
+     * @param   aToken contains the tag in question
+     * @param   aTag is the tag itself.
+     * @param   aNode is the node (tag) with associated attributes.
+     * @return  NS_OK if we should continue, a failure code otherwise.
+     */
     nsresult        WillHandleStartTag(CToken* aToken,eHTMLTags aChildTag,nsIParserNode& aNode);
     nsresult        DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag);
-    nsresult        HandleOmittedTag(CToken* aToken,eHTMLTags aChildTag,eHTMLTags aParent,nsIParserNode *aNode);
+
+    /**
+     *  This method gets called when a start token has been encountered that
+     *  the parent wants to omit. It stashes it in the current element if that
+     *  element accepts such misplaced tokens.
+     *
+     *  @param   aToken Next (start) token to be handled
+     *  @param   aChildTag id of the child in question
+     *  @param   aParent id of the parent in question
+     *  @param   aNode CParserNode representing this start token
+     */
+    void            HandleOmittedTag(CToken* aToken, eHTMLTags aChildTag,
+                                     eHTMLTags aParent, nsIParserNode *aNode);
     nsresult        HandleSavedTokens(PRInt32 anIndex);
     nsresult        HandleKeyGen(nsIParserNode *aNode);
     PRBool          IsAlternateTag(eHTMLTags aTag);