Mozilla bug 1859527 - Include nsHtml5Attributes.h from StackNode and remove boilerplate includes from .cpp files.

Author: hsivonen

translator-src/nu/validator/htmlparser/cpptranslate/CppTypes.java

@@ -98,6 +98,13 @@ public class CppTypes {
             "nsHtml5NamedCharactersAccel", "nsHtml5String",
             "nsHtml5TokenizerLoopPolicies", "nsIContent", "nsTraceRefcnt" };
 
+    private static final String[] STACK_NODE_INCLUDES = { "nsAtom", "nsHtml5AtomTable",
+            "nsHtml5HtmlAttributes", "nsHtml5String", "nsNameSpaceManager", "nsIContent",
+            "nsTraceRefcnt", "jArray", "nsHtml5ArrayCopy",
+            "nsAHtml5TreeBuilderState", "nsGkAtoms", "nsHtml5ByteReadable",
+            "nsHtml5Macros", "nsIContentHandle", "nsHtml5Portability",
+            "nsHtml5ContentCreatorFunction" };
+
     private static final String[] INCLUDES = { "nsAtom", "nsHtml5AtomTable",
             "nsHtml5String", "nsNameSpaceManager", "nsIContent",
             "nsTraceRefcnt", "jArray", "nsHtml5ArrayCopy",
@@ -365,6 +372,8 @@ public String[] boilerplateIncludes(String javaClass) {
             return TREE_BUILDER_INCLUDES;
         } else if ("Tokenizer".equals(javaClass)) {
             return TOKENIZER_INCLUDES;
+        } else if ("StackNode".equals(javaClass)) {
+            return STACK_NODE_INCLUDES;
         } else {
             return INCLUDES;
         }

translator-src/nu/validator/htmlparser/cpptranslate/CppVisitor.java

@@ -424,16 +424,6 @@ protected void startClassDeclaration() {
         printer.printLn("_cpp__");
         printer.printLn();
 
-        String[] incs = cppTypes.boilerplateIncludes(javaClassName);
-        for (int i = 0; i < incs.length; i++) {
-            String inc = incs[i];
-            printer.print("#include \"");
-            printer.print(inc);
-            printer.printLn(".h\"");
-        }
-
-        printer.printLn();
-
         for (int i = 0; i < Main.H_LIST.length; i++) {
             String klazz = Main.H_LIST[i];
             if (!klazz.equals(javaClassName)) {