bug 142771: Fix ScanDocStructure to be more correct in marking tokens as malformed. r=bzbarsky sr=rbs. These files were left out of the original checkin

parser/htmlparser/public/nsHTMLTokens.h

@@ -146,7 +146,9 @@ public:
   // the following info is used to set well-formedness state on start tags...
   virtual eContainerInfo GetContainerInfo(void) const {return mContainerInfo;}
   virtual void SetContainerInfo(eContainerInfo aContainerInfo) {
-    mContainerInfo=aContainerInfo;
+    if (eFormUnknown==mContainerInfo) {
+      mContainerInfo=aContainerInfo;
+    }
   }
   virtual PRBool IsWellFormed(void) const {
     return eWellFormed == mContainerInfo;

parser/htmlparser/src/nsHTMLTokenizer.h

@@ -98,6 +98,9 @@ protected:
   nsDeque            mTokenDeque;
   PRPackedBool       mIsFinalChunk;
   nsTokenAllocator*  mTokenAllocator;
+  // This variable saves the position of the last tag we inspected in
+  // ScanDocStructure. We start scanning the general well-formedness of the
+  // document starting at this position each time.
   PRInt32            mTokenScanPos;
   PRUint32           mFlags;
 };