From bec4d0ecdc2576e09b02baaf24961e70dceec605 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 18 Jan 2020 22:51:56 -0500 Subject: Bug 1355779 - Skip interned ElementName lookup for Custom Elements (ones with hyphen). Regen. Tag UXP Issue #1344 --- .../nu/validator/htmlparser/impl/ElementName.java | 333 ++++++++++----------- 1 file changed, 166 insertions(+), 167 deletions(-) (limited to 'parser/html/java/htmlparser/src') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java index e772e7e70..ebfd8294b 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java @@ -903,7 +903,7 @@ public final class ElementName public static final ElementName SUMMARY = new ElementName("summary", "summary", TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); public static final ElementName TBODY = new ElementName("tbody", "tbody", TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); private final static @NoLength ElementName[] ELEMENT_NAMES = { - VKERN, + AUDIO, MSPACE, FOREIGNOBJECT, EULERGAMMA, @@ -913,7 +913,7 @@ public final class ElementName PRE, ANIMATE, FEFUNCG, - ARCTAN, + ARCSIN, OR, PROGRESS, MOMENT, @@ -924,9 +924,9 @@ public final class ElementName FONT_FACE, TABLE, GLYPH, - INTERVAL, - MN, - BR, + OL, + KEYGEN, + ABBR, MLABELEDTR, INTEGERS, ARCCOT, @@ -947,11 +947,11 @@ public final class ElementName ARCSINH, SECH, TRACK, - ANIMATETRANSFORM, - CAPTION, - OPTION, - MALIGNGROUP, - FECOMPONENTTRANSFER, + ACRONYM, + CONDITION, + POLYGON, + MSUBSUP, + FILTER, METER, TR, DEFS, @@ -991,17 +991,17 @@ public final class ElementName MPATH, TEXTPATH, MARK, - CURL, - REAL, - MENUITEM, - ANIMATEMOTION, - IN, - MEDIAN, - SPAN, - VIDEO, - OPTGROUP, - CENTER, - FEGAUSSIANBLUR, + FACTORIAL, + SMALL, + MPHANTOM, + BUTTON, + FIGCAPTION, + MAIN, + SECTION, + COLGROUP, + SAMP, + CURSOR, + HEADER, MUNDER, MUNDEROVER, NOTANUMBER, @@ -1080,26 +1080,27 @@ public final class ElementName FONT_FACE_URI, PI, MASK, - FORALL, - LABEL, - SYMBOL, - EM, - PARAM, - ANIMATION, - FN, - DOMAIN, - HKERN, - LAPLACIAN, - MACTION, - PATTERN, - TSPAN, - MO, - FEDISPLACEMENTMAP, - MSUP, - STOP, - ANIMATECOLOR, - HR, - FOOTER, + CSYMBOL, + HTML, + UL, + ALTGLYPHITEM, + FORM, + CN, + ANNOTATION, + CODOMAIN, + DOMAINOFAPPLICATION, + LN, + MEAN, + NOTIN, + RELN, + UNION, + TENDSTO, + HGROUP, + RP, + EQ, + BVAR, + FEFUNCR, + FLOOR, HANDLER, LISTENER, MARKER, @@ -1258,51 +1259,50 @@ public final class ElementName MALIGNMARK, TBREAK, DL, - CSYMBOL, - FACTORIAL, - HTML, - OL, - UL, - SMALL, - ALTGLYPHITEM, - ACRONYM, - FORM, - MPHANTOM, - CN, - ARCSIN, - ANNOTATION, - BUTTON, - CODOMAIN, - CONDITION, - DOMAINOFAPPLICATION, - FIGCAPTION, - LN, - KEYGEN, - MEAN, - MAIN, - NOTIN, - POLYGON, - RELN, - SECTION, - UNION, - AUDIO, - TENDSTO, - COLGROUP, - HGROUP, - MSUBSUP, - RP, - SAMP, - EQ, - ABBR, - BVAR, - CURSOR, - FEFUNCR, - FILTER, - FLOOR, - HEADER, + CURL, + FORALL, + INTERVAL, + LABEL, + REAL, + SYMBOL, + ANIMATETRANSFORM, + EM, + MENUITEM, + PARAM, + ARCTAN, + ANIMATION, + ANIMATEMOTION, + FN, + CAPTION, + DOMAIN, + IN, + HKERN, + MN, + LAPLACIAN, + MEDIAN, + MACTION, + OPTION, + PATTERN, + SPAN, + TSPAN, + VKERN, + MO, + VIDEO, + FEDISPLACEMENTMAP, + MALIGNGROUP, + MSUP, + OPTGROUP, + STOP, + BR, + ANIMATECOLOR, + CENTER, + HR, + FECOMPONENTTRANSFER, + FOOTER, + FEGAUSSIANBLUR, }; private final static int[] ELEMENT_HASHES = { - 1909280949, + 1914900309, 1753319686, 2001309869, 1682186266, @@ -1312,7 +1312,7 @@ public final class ElementName 58773795, 1747306711, 1783210839, - 1897999926, + 1898130486, 1970798594, 1990037800, 2005160150, @@ -1323,9 +1323,9 @@ public final class ElementName 1749649513, 1757137429, 1800730821, - 1868641064, - 1902641154, - 1963982850, + 1870135298, + 1903302038, + 1965115924, 1971703386, 1986351224, 1998883894, @@ -1346,11 +1346,11 @@ public final class ElementName 1797544247, 1806799156, 1857653029, - 1881498736, - 1899272519, - 1905563974, - 1938171179, - 1967788867, + 1881613047, + 1899272521, + 1906087319, + 1938172967, + 1967795910, 1971465813, 1973420034, 1983533124, @@ -1390,17 +1390,17 @@ public final class ElementName 1803929861, 1807599880, 1854228692, - 1865773108, - 1873350948, - 1887579800, - 1898223949, - 1900544002, - 1904285766, - 1907435316, - 1925844629, - 1939219752, - 1966223078, - 1968053806, + 1867061545, + 1874053333, + 1887743720, + 1898753862, + 1900845386, + 1904412884, + 1907661127, + 1932928296, + 1941178676, + 1966386470, + 1968836118, 1971457766, 1971467002, 1971981018, @@ -1479,27 +1479,27 @@ public final class ElementName 1817013469, 1820327938, 1854245076, - 1864643294, - 1867237670, - 1870268949, - 1874102998, - 1881669634, - 1889085973, - 1898223945, - 1898971138, - 1899694294, - 1901940917, - 1903761465, - 1904515399, - 1906135367, - 1907959605, - 1919418370, - 1934172497, - 1938173140, - 1941221172, - 1965334268, - 1967128578, - 1967795958, + 1865714391, + 1868312196, + 1873281026, + 1881288348, + 1884120164, + 1897398274, + 1898223946, + 1899170008, + 1899796819, + 1902116866, + 1904283860, + 1904946933, + 1907085604, + 1908709605, + 1925049415, + 1935549734, + 1938817026, + 1948778498, + 1965634084, + 1967760215, + 1967957189, 1968840263, 1970938456, 1971461414, @@ -1658,47 +1658,46 @@ public final class ElementName 1854228698, 1857622310, 1864368130, - 1865714391, - 1867061545, - 1868312196, - 1870135298, - 1873281026, - 1874053333, - 1881288348, - 1881613047, - 1884120164, - 1887743720, - 1897398274, - 1898130486, - 1898223946, - 1898753862, - 1899170008, - 1899272521, - 1899796819, - 1900845386, - 1902116866, - 1903302038, - 1904283860, - 1904412884, - 1904946933, - 1906087319, - 1907085604, - 1907661127, - 1908709605, - 1914900309, - 1925049415, - 1932928296, - 1935549734, - 1938172967, - 1938817026, - 1941178676, - 1948778498, - 1965115924, - 1965634084, - 1966386470, - 1967760215, - 1967795910, - 1967957189, - 1968836118, + 1865773108, + 1867237670, + 1868641064, + 1870268949, + 1873350948, + 1874102998, + 1881498736, + 1881669634, + 1887579800, + 1889085973, + 1897999926, + 1898223945, + 1898223949, + 1898971138, + 1899272519, + 1899694294, + 1900544002, + 1901940917, + 1902641154, + 1903761465, + 1904285766, + 1904515399, + 1905563974, + 1906135367, + 1907435316, + 1907959605, + 1909280949, + 1919418370, + 1925844629, + 1934172497, + 1938171179, + 1938173140, + 1939219752, + 1941221172, + 1963982850, + 1965334268, + 1966223078, + 1967128578, + 1967788867, + 1967795958, + 1968053806, }; } -- cgit v1.2.3