fixed a state problem in parser related to nesting levels

htmlparser/src/CNavDTD.cpp

@@ -427,9 +427,9 @@ nsresult CNavDTD::WillBuildModel(nsString& aFilename,PRInt32 aLevel){
   nsresult result=NS_OK;
 
   mFilename=aFilename;
-  mLineNumber=1;
 
   if((1==aLevel) && (mSink)) {
+    mLineNumber=1;
     result = mSink->WillBuildModel();
   }
 

htmlparser/src/nsParser.cpp

@@ -497,6 +497,7 @@ PRInt32 nsParser::Parse(fstream& aStream){
 
   pc=PopContext();
   delete pc;
+  mParseLevel--;
 
   return status;
 }
@@ -528,6 +529,7 @@ PRInt32 nsParser::Parse(nsString& aSourceBuffer,PRBool anHTMLString){
   }
   pc=PopContext();
   delete pc;
+  mParseLevel--;
   return result;
 }
 

parser/htmlparser/src/CNavDTD.cpp

@@ -427,9 +427,9 @@ nsresult CNavDTD::WillBuildModel(nsString& aFilename,PRInt32 aLevel){
   nsresult result=NS_OK;
 
   mFilename=aFilename;
-  mLineNumber=1;
 
   if((1==aLevel) && (mSink)) {
+    mLineNumber=1;
     result = mSink->WillBuildModel();
   }
 

parser/htmlparser/src/nsParser.cpp

@@ -497,6 +497,7 @@ PRInt32 nsParser::Parse(fstream& aStream){
 
   pc=PopContext();
   delete pc;
+  mParseLevel--;
 
   return status;
 }
@@ -528,6 +529,7 @@ PRInt32 nsParser::Parse(nsString& aSourceBuffer,PRBool anHTMLString){
   }
   pc=PopContext();
   delete pc;
+  mParseLevel--;
   return result;
 }