Bug 772758 - Clean up some build warnings in html5 parser r=hsivonen

Brli · Jul 13, 2012 · ea89ec4 · ea89ec4
1 parent bfaac5c
commit ea89ec4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/parser/html/javasrc/Tokenizer.java b/parser/html/javasrc/Tokenizer.java
@@ -497,10 +497,10 @@ public class Tokenizer implements Locator {
 
     private final boolean newAttributesEachTime;
 
-    // ]NOCPP]
-
     private int mappingLangToXmlLang;
 
+    // ]NOCPP]
+
     private boolean shouldSuspend;
 
     protected boolean confident;

diff --git a/parser/html/nsHtml5Parser.h b/parser/html/nsHtml5Parser.h
@@ -273,11 +273,6 @@ class nsHtml5Parser : public nsIParser,
      */
     bool                          mDocWriteSpeculativeLastWasCR;
 
-    /**
-     * The parser is in the fragment mode
-     */
-    bool                          mFragmentMode;
-
     /**
      * The parser is blocking on a script
      */
@@ -300,9 +295,6 @@ class nsHtml5Parser : public nsIParser,
 
     bool                          mInDocumentWrite;
 
-    // Gecko integration
-    void*                         mRootContextKey;
-
     // Portable parser objects
     /**
      * The first buffer in the pending UTF-16 buffer queue

diff --git a/parser/html/nsHtml5ReleasableAttributeName.h b/parser/html/nsHtml5ReleasableAttributeName.h
@@ -6,10 +6,11 @@
 #define nsHtml5ReleasableAttributeName_h__
 
 #include "nsHtml5AttributeName.h"
+#include "mozilla/Attributes.h"
 
 class nsHtml5AtomTable;
 
-class nsHtml5ReleasableAttributeName : public nsHtml5AttributeName
+class nsHtml5ReleasableAttributeName MOZ_FINAL : public nsHtml5AttributeName
 {
   public:
     nsHtml5ReleasableAttributeName(PRInt32* uri, nsIAtom** local, nsIAtom** prefix);

diff --git a/parser/html/nsHtml5ReleasableElementName.h b/parser/html/nsHtml5ReleasableElementName.h
@@ -6,8 +6,9 @@
 #define nsHtml5ReleasableElementName_h__
 
 #include "nsHtml5ElementName.h"
+#include "mozilla/Attributes.h"
 
-class nsHtml5ReleasableElementName : public nsHtml5ElementName
+class nsHtml5ReleasableElementName MOZ_FINAL : public nsHtml5ElementName
 {
   public:
     nsHtml5ReleasableElementName(nsIAtom* name);

diff --git a/parser/html/nsHtml5Tokenizer.h b/parser/html/nsHtml5Tokenizer.h
@@ -131,7 +131,6 @@ class nsHtml5Tokenizer
     nsString* publicIdentifier;
     nsString* systemIdentifier;
     nsHtml5HtmlAttributes* attributes;
-    PRInt32 mappingLangToXmlLang;
     bool shouldSuspend;
   protected:
     bool confident;