Mozilla bug 1372276 - Remove menuitem. (#70)

See Mozilla bug 1775477.

Co-authored-by: Henri Sivonen <hsivonen@hsivonen.fi>

Author: emilio

src/nu/validator/htmlparser/impl/ElementName.java

@@ -557,8 +557,6 @@ public void destructor() {
 //                return "ANNOTATION_XML";
 //            case TreeBuilder.FOREIGNOBJECT_OR_DESC:
 //                return "FOREIGNOBJECT_OR_DESC";
-//            case TreeBuilder.MENUITEM:
-//                return "MENUITEM";
 //        }
 //        return null;
 //    }
@@ -1143,10 +1141,6 @@ public void destructor() {
 // CPPONLY: NS_NewHTMLFormElement,
 // CPPONLY: NS_NewSVGUnknownElement, 
 TreeBuilder.FORM | SPECIAL);
-public static final ElementName MENUITEM = new ElementName("menuitem", "menuitem", 
-// CPPONLY: NS_NewHTMLMenuItemElement,
-// CPPONLY: NS_NewSVGUnknownElement, 
-TreeBuilder.MENUITEM);
 public static final ElementName PARAM = new ElementName("param", "param", 
 // CPPONLY: NS_NewHTMLSharedElement,
 // CPPONLY: NS_NewSVGUnknownElement, 
@@ -1484,7 +1478,7 @@ public void destructor() {
 // CPPONLY: NS_NewSVGUnknownElement, 
 TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
 private final static @NoLength ElementName[] ELEMENT_NAMES = {
-FIGCAPTION,
+MN,
 CITE,
 FRAMESET,
 H1,
@@ -1495,7 +1489,7 @@ public void destructor() {
 BGSOUND,
 SOURCE,
 HTML,
-RP,
+OPTGROUP,
 NOFRAMES,
 MTEXT,
 VIEW,
@@ -1507,8 +1501,8 @@ public void destructor() {
 GLYPHREF,
 LI,
 ACRONYM,
-SECTION,
-HR,
+TSPAN,
+FEFUNCR,
 CANVAS,
 BASEFONT,
 FEDISTANTLIGHT,
@@ -1530,11 +1524,11 @@ public void destructor() {
 PATH,
 MALIGNMARK,
 SMALL,
-PARAM,
-OPTION,
-VIDEO,
-BR,
-FOOTER,
+ANIMATEMOTION,
+POLYGON,
+COLGROUP,
+ABBR,
+FEGAUSSIANBLUR,
 TR,
 DETAILS,
 DT,
@@ -1578,15 +1572,15 @@ public void destructor() {
 LABEL,
 ALTGLYPHITEM,
 FORM,
-BUTTON,
-KEYGEN,
-PATTERN,
-AUDIO,
-FEDISPLACEMENTMAP,
-SAMP,
-ANIMATECOLOR,
-FECOMPONENTTRANSFER,
-HEADER,
+CAPTION,
+MAIN,
+SPAN,
+MO,
+HGROUP,
+STOP,
+CENTER,
+FILTER,
+MARKER,
 NOBR,
 ADDRESS,
 DEFS,
@@ -1672,28 +1666,27 @@ public void destructor() {
 SYMBOL,
 ANIMATETRANSFORM,
 EM,
-MENUITEM,
-ANIMATEMOTION,
-CAPTION,
-MN,
-MAIN,
-POLYGON,
-SPAN,
-TSPAN,
-MO,
-COLGROUP,
-HGROUP,
-OPTGROUP,
-STOP,
-ABBR,
-CENTER,
-FEFUNCR,
-FILTER,
-FEGAUSSIANBLUR,
-MARKER,
+PARAM,
+BUTTON,
+FIGCAPTION,
+KEYGEN,
+OPTION,
+PATTERN,
+SECTION,
+AUDIO,
+VIDEO,
+FEDISPLACEMENTMAP,
+RP,
+SAMP,
+BR,
+ANIMATECOLOR,
+HR,
+FECOMPONENTTRANSFER,
+FOOTER,
+HEADER,
 };
 private final static int[] ELEMENT_HASHES = {
-1900845386,
+1902641154,
 1748359220,
 2001349720,
 876609538,
@@ -1704,7 +1697,7 @@ public void destructor() {
 1730965751,
 1756474198,
 1868312196,
-1938817026,
+1939219752,
 1988763672,
 2005324101,
 2060065124,
@@ -1716,8 +1709,8 @@ public void destructor() {
 1766992520,
 1818230786,
 1881613047,
-1907661127,
-1967128578,
+1907959605,
+1967760215,
 1982935782,
 1999397992,
 2001392798,
@@ -1739,11 +1732,11 @@ public void destructor() {
 1805502724,
 1854228698,
 1874053333,
-1889085973,
-1905563974,
-1925844629,
-1963982850,
-1967795958,
+1898223949,
+1906087319,
+1932928296,
+1965115924,
+1968053806,
 1973420034,
 1983633431,
 1998585858,
@@ -1787,15 +1780,15 @@ public void destructor() {
 1870268949,
 1881288348,
 1884120164,
-1898753862,
-1903302038,
-1906135367,
-1914900309,
-1934172497,
-1941178676,
-1965334268,
-1967788867,
-1968836118,
+1899272519,
+1904412884,
+1907435316,
+1919418370,
+1935549734,
+1941221172,
+1966223078,
+1967795910,
+1971461414,
 1971938532,
 1982173479,
 1983533124,
@@ -1881,24 +1874,23 @@ public void destructor() {
 1874102998,
 1881498736,
 1881669634,
-1887579800,
-1898223949,
-1899272519,
-1902641154,
-1904412884,
-1906087319,
-1907435316,
-1907959605,
-1919418370,
-1932928296,
-1935549734,
-1939219752,
-1941221172,
-1965115924,
-1966223078,
-1967760215,
-1967795910,
-1968053806,
-1971461414,
+1889085973,
+1898753862,
+1900845386,
+1903302038,
+1905563974,
+1906135367,
+1907661127,
+1914900309,
+1925844629,
+1934172497,
+1938817026,
+1941178676,
+1963982850,
+1965334268,
+1967128578,
+1967788867,
+1967795958,
+1968836118,
 };
 }

src/nu/validator/htmlparser/impl/TreeBuilder.java

@@ -196,11 +196,9 @@ public abstract class TreeBuilder<T> implements TokenHandler,
 
     final static int KEYGEN = 65;
 
-    final static int MENUITEM = 66;
+    final static int TEMPLATE = 66;
 
-    final static int TEMPLATE = 67;
-
-    final static int IMG = 68;
+    final static int IMG = 67;
 
     // start insertion modes
 
@@ -2121,7 +2119,6 @@ public final void startTag(ElementName elementName,
                                 reconstructTheActiveFormattingElements();
                                 // FALL THROUGH to PARAM_OR_SOURCE_OR_TRACK
                                 // CPPONLY: MOZ_FALLTHROUGH;
-                            // CPPONLY: case MENUITEM:
                             case PARAM_OR_SOURCE_OR_TRACK:
                                 appendVoidElementToCurrentMayFoster(
                                         elementName,
@@ -3570,7 +3567,6 @@ public final void endTag(ElementName elementName) throws SAXException {
                             break;
                         case AREA_OR_WBR:
                         case KEYGEN: // XXX??
-                        // CPPONLY: case MENUITEM:
                         case PARAM_OR_SOURCE_OR_TRACK:
                         case EMBED:
                         case IMG:

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

@@ -1961,16 +1961,9 @@ public void visit(SwitchStmt n, LocalSymbolTable arg) {
 
     public void visit(SwitchEntryStmt n, LocalSymbolTable arg) {
         if (n.getLabel() != null) {
-            boolean isMenuitem = n.getLabel().toString().equals("MENUITEM");
-            if (isMenuitem) {
-                printer.printWithoutIndent("#ifdef ENABLE_VOID_MENUITEM\n");
-            }
             printer.print("case ");
             n.getLabel().accept(this, arg);
             printer.print(":");
-            if (isMenuitem) {
-                printer.printWithoutIndent("\n#endif");
-            }
         } else {
             printer.print("default:");
         }