From f828451e5f9b4fe63545485dcb97f7e3e4a425b2 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Mon, 1 Jun 2020 14:16:06 +0200 Subject: Issue #1525 - Kill marquee element * Remove marquee code * Regenerate HTML Elements/parser code for Removal of Marquee. Co-authored-by: Gaming4JC --- .../nu/validator/htmlparser/impl/ElementName.java | 660 ++++++++++----------- parser/html/nsHtml5AtomList.h | 1 - parser/html/nsHtml5ElementName.cpp | 324 +++++----- parser/html/nsHtml5ElementName.h | 1 - parser/htmlparser/nsHTMLTagList.h | 1 - 5 files changed, 487 insertions(+), 500 deletions(-) (limited to 'parser') 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 4b87d3fde..c888cdae1 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 @@ -1191,10 +1191,6 @@ public final class ElementName // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); - public static final ElementName MARQUEE = new ElementName("marquee", "marquee", - // CPPONLY: NS_NewHTMLDivElement, - // CPPONLY: NS_NewSVGUnknownElement, - TreeBuilder.MARQUEE_OR_APPLET | SPECIAL | SCOPING); public static final ElementName MTABLE = new ElementName("mtable", "mtable", // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGUnknownElement, @@ -2268,18 +2264,18 @@ public final class ElementName // CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); private final static @NoLength ElementName[] ELEMENT_NAMES = { - VKERN, + AUDIO, LOGBASE, FIELDSET, DATA, - LI, + IMAGINARYI, CANVAS, QUOTIENT, PRE, ARTICLE, - DIALOG, - ARCTAN, - LISTENER, + FEFUNCG, + ARCSIN, + MUNDER, REALS, MROOT, MROW, @@ -2287,11 +2283,11 @@ public final class ElementName G, DD, ELLIPSE, - STYLE, - COTH, - INTERVAL, - MN, - BR, + TABLE, + GLYPH, + OL, + KEYGEN, + ABBR, NOTANUMBER, MPRESCRIPTS, CARTESIANPRODUCT, @@ -2307,16 +2303,16 @@ public final class ElementName HEAD, CONJUGATE, FRAME, - OTHERWISE, - ALTGLYPHDEF, - ARCTANH, - TH, - TBREAK, - ANIMATETRANSFORM, - CAPTION, - OPTION, - MALIGNGROUP, - FECOMPONENTTRANSFER, + PIECE, + DIFF, + ARCSINH, + SECH, + TRACK, + ACRONYM, + CONDITION, + POLYGON, + MSUBSUP, + FILTER, MUNDEROVER, SELECTOR, EXISTS, @@ -2347,26 +2343,26 @@ public final class ElementName DEGREE, FEIMAGE, IMAGE, - MTABLE, - PIECEWISE, - TRANSPOSE, - PARTIALDIFF, - LISTING, - ARCCOTH, - MATH, - TANH, - LINK, - CURL, - REAL, - MENUITEM, - ANIMATEMOTION, - IN, - MEDIAN, - SPAN, - VIDEO, - OPTGROUP, - CENTER, - FEGAUSSIANBLUR, + MSTYLE, + RULE, + TEMPLATE, + SETDIFF, + STRONG, + CSCH, + MPATH, + TEXTPATH, + MARK, + FACTORIAL, + SMALL, + MPHANTOM, + BUTTON, + FIGCAPTION, + MAIN, + SECTION, + COLGROUP, + SAMP, + CURSOR, + HEADER, METER, MLABELEDTR, TR, @@ -2428,45 +2424,45 @@ public final class ElementName FALSE, INVERSE, MODE, - MENCLOSE, - POLYLINE, - SOURCE, - TITLE, - TRUE, - FACTOROF, - TREF, - FEDIFFUSELIGHTING, - ARCSECH, - ALTGLYPH, - COSH, - MGLYPH, - PREFETCH, - SWITCH, - CI, - MI, - MALIGNMARK, - DL, - FORALL, - LABEL, - SYMBOL, - EM, - PARAM, - ANIMATION, - FN, - DOMAIN, - HKERN, - LAPLACIAN, - MACTION, - PATTERN, - TSPAN, - MO, - FEDISPLACEMENTMAP, - MSUP, - STOP, - ANIMATECOLOR, - HR, - FOOTER, - HANDLER, + NONE, + PICTURE, + STRIKE, + TIME, + VARIANCE, + GLYPHREF, + CEILING, + FESPECULARLIGHTING, + ARCCSCH, + ARCCOSH, + CLIPPATH, + MISSING_GLYPH, + PATH, + SINH, + FONT_FACE_URI, + PI, + MASK, + CSYMBOL, + HTML, + UL, + ALTGLYPHITEM, + FORM, + CN, + ANNOTATION, + CODOMAIN, + DOMAINOFAPPLICATION, + LN, + MEAN, + NOTIN, + RELN, + UNION, + TENDSTO, + HGROUP, + RP, + EQ, + BVAR, + FEFUNCR, + FLOOR, + OR, MARKER, MOVER, MERROR, @@ -2588,112 +2584,111 @@ public final class ElementName IFRAME, LINE, MSPACE, - MARQUEE, - MSTYLE, - NONE, - PIECE, - PICTURE, - RULE, - STRIKE, - TABLE, - TIME, - TEMPLATE, - VARIANCE, - DIFF, - GLYPHREF, - SETDIFF, - CEILING, - FEFUNCG, - FESPECULARLIGHTING, - STRONG, - ARCCSCH, - ARCSINH, - ARCCOSH, - CSCH, - CLIPPATH, - GLYPH, - MISSING_GLYPH, - MPATH, - PATH, - SECH, - SINH, - TEXTPATH, - FONT_FACE_URI, - IMAGINARYI, - PI, - MARK, - MASK, - TRACK, - 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, - OR, - MUNDER, - }; - private final static int[] ELEMENT_HASHES = { - 1909280949, - 1753057319, - 2001349704, - 1681770564, - 1818230786, - 1982935782, - 2007257240, - 58773795, - 1747176599, - 1782357526, - 1897999926, - 1970938456, - 1990969429, - 2005181733, + MTABLE, + MENCLOSE, + OTHERWISE, + POLYLINE, + PIECEWISE, + SOURCE, + STYLE, + TITLE, + TRANSPOSE, + TRUE, + ALTGLYPHDEF, + FACTOROF, + PARTIALDIFF, + TREF, + DIALOG, + FEDIFFUSELIGHTING, + LISTING, + ARCSECH, + ARCTANH, + ALTGLYPH, + ARCCOTH, + COSH, + COTH, + MGLYPH, + MATH, + PREFETCH, + TH, + SWITCH, + TANH, + CI, + LI, + MI, + LINK, + MALIGNMARK, + TBREAK, + DL, + 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, + HANDLER, + LISTENER, + }; + private final static int[] ELEMENT_HASHES = { + 1914900309, + 1753057319, + 2001349704, + 1681770564, + 1818700314, + 1982935782, + 2007257240, + 58773795, + 1747176599, + 1783210839, + 1898130486, + 1971457766, + 1990969429, + 2005181733, 2055514836, 54061139, 62390273, 1730150402, 1749395095, - 1756625221, - 1798693940, - 1868641064, - 1902641154, - 1963982850, + 1757137429, + 1800730821, + 1870135298, + 1903302038, + 1965115924, 1971981018, 1988486811, 1999745104, @@ -2709,16 +2704,16 @@ public final class ElementName 1733890180, 1748355193, 1749813541, - 1754634617, - 1763839627, - 1797540167, - 1805647874, - 1857622310, - 1881498736, - 1899272519, - 1905563974, - 1938171179, - 1967788867, + 1754894485, + 1765431364, + 1797544247, + 1806799156, + 1857653029, + 1881613047, + 1899272521, + 1906087319, + 1938172967, + 1967795910, 1971467002, 1974775352, 1984294038, @@ -2749,26 +2744,26 @@ public final class ElementName 1748642422, 1749715159, 1751288021, - 1753467414, - 1755158905, - 1757259017, - 1771722827, - 1786534215, - 1797645367, - 1803929812, - 1807501636, - 1853642948, - 1865773108, - 1873350948, - 1887579800, - 1898223949, - 1900544002, - 1904285766, - 1907435316, - 1925844629, - 1939219752, - 1966223078, - 1968053806, + 1753479494, + 1756098852, + 1757268168, + 1773295687, + 1790207270, + 1798417460, + 1803929861, + 1807599880, + 1854228692, + 1867061545, + 1874053333, + 1887743720, + 1898753862, + 1900845386, + 1904412884, + 1907661127, + 1932928296, + 1941178676, + 1966386470, + 1968836118, 1971465813, 1971703386, 1973420034, @@ -2830,45 +2825,45 @@ public final class ElementName 1749917205, 1751493207, 1753343188, - 1753588936, - 1755076808, - 1756474198, - 1757146773, - 1757293380, - 1766632184, - 1773808452, - 1783388497, - 1797361975, - 1797585096, - 1798677556, - 1803876550, - 1805233752, - 1806806678, - 1813512194, - 1818755074, - 1854228698, - 1864368130, - 1867237670, - 1870268949, - 1874102998, - 1881669634, - 1889085973, - 1898223945, - 1898971138, - 1899694294, - 1901940917, - 1903761465, - 1904515399, - 1906135367, - 1907959605, - 1919418370, - 1934172497, - 1938173140, - 1941221172, - 1965334268, - 1967128578, - 1967795958, - 1968840263, + 1754031332, + 1755148615, + 1756600614, + 1757157700, + 1758044696, + 1766992520, + 1781815495, + 1783388498, + 1797368887, + 1797628983, + 1798686984, + 1803876557, + 1805502724, + 1806981428, + 1817013469, + 1820327938, + 1854245076, + 1865714391, + 1868312196, + 1873281026, + 1881288348, + 1884120164, + 1897398274, + 1898223946, + 1899170008, + 1899796819, + 1902116866, + 1904283860, + 1904946933, + 1907085604, + 1908709605, + 1925049415, + 1935549734, + 1938817026, + 1948778498, + 1965634084, + 1967760215, + 1967957189, + 1970798594, 1971461414, 1971466997, 1971628838, @@ -2990,85 +2985,84 @@ public final class ElementName 1751386406, 1752979652, 1753319686, - 1753362711, - 1753479494, - 1754031332, - 1754894485, - 1755148615, - 1756098852, - 1756600614, - 1757137429, - 1757157700, - 1757268168, - 1758044696, - 1765431364, - 1766992520, - 1773295687, - 1781815495, - 1783210839, - 1783388498, - 1790207270, - 1797368887, - 1797544247, - 1797628983, - 1798417460, - 1798686984, - 1800730821, - 1803876557, - 1803929861, - 1805502724, - 1806799156, - 1806981428, - 1807599880, - 1817013469, - 1818700314, - 1820327938, - 1854228692, - 1854245076, - 1857653029, - 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, - 1970798594, - 1971457766, + 1753467414, + 1753588936, + 1754634617, + 1755076808, + 1755158905, + 1756474198, + 1756625221, + 1757146773, + 1757259017, + 1757293380, + 1763839627, + 1766632184, + 1771722827, + 1773808452, + 1782357526, + 1783388497, + 1786534215, + 1797361975, + 1797540167, + 1797585096, + 1797645367, + 1798677556, + 1798693940, + 1803876550, + 1803929812, + 1805233752, + 1805647874, + 1806806678, + 1807501636, + 1813512194, + 1818230786, + 1818755074, + 1853642948, + 1854228698, + 1857622310, + 1864368130, + 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, + 1968840263, + 1970938456, }; } diff --git a/parser/html/nsHtml5AtomList.h b/parser/html/nsHtml5AtomList.h index 0728f439b..6c8874dde 100644 --- a/parser/html/nsHtml5AtomList.h +++ b/parser/html/nsHtml5AtomList.h @@ -800,7 +800,6 @@ HTML5_ATOM(inverse, "inverse") HTML5_ATOM(line, "line") HTML5_ATOM(logbase, "logbase") HTML5_ATOM(mspace, "mspace") -HTML5_ATOM(marquee, "marquee") HTML5_ATOM(mtable, "mtable") HTML5_ATOM(mstyle, "mstyle") HTML5_ATOM(menclose, "menclose") diff --git a/parser/html/nsHtml5ElementName.cpp b/parser/html/nsHtml5ElementName.cpp index ecdfb102d..af9436f08 100644 --- a/parser/html/nsHtml5ElementName.cpp +++ b/parser/html/nsHtml5ElementName.cpp @@ -217,7 +217,6 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_LINE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_LOGBASE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MSPACE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MODE = nullptr; -nsHtml5ElementName* nsHtml5ElementName::ELT_MARQUEE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MTABLE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MSTYLE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MENCLOSE = nullptr; @@ -487,7 +486,7 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_RUBY = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_SUMMARY = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_TBODY = nullptr; nsHtml5ElementName** nsHtml5ElementName::ELEMENT_NAMES = 0; -static int32_t const ELEMENT_HASHES_DATA[] = { 1909280949, 1753057319, 2001349704, 1681770564, 1818230786, 1982935782, 2007257240, 58773795, 1747176599, 1782357526, 1897999926, 1970938456, 1990969429, 2005181733, 2055514836, 54061139, 62390273, 1730150402, 1749395095, 1756625221, 1798693940, 1868641064, 1902641154, 1963982850, 1971981018, 1988486811, 1999745104, 2002882873, 2005925890, 2008340774, 2082727685, 51965171, 57200451, 60350803, 69730305, 1703292116, 1733890180, 1748355193, 1749813541, 1754634617, 1763839627, 1797540167, 1805647874, 1857622310, 1881498736, 1899272519, 1905563974, 1938171179, 1967788867, 1971467002, 1974775352, 1984294038, 1988972590, 1998585858, 2000825752, 2001392796, 2004557976, 2005543977, 2006560839, 2008125638, 2009706573, 2068523853, 2087049448, 51434643, 52488851, 56151587, 57210387, 59826259, 60354131, 63438849, 926941186, 1686489160, 1715300574, 1732381397, 1737099991, 1748100148, 1748642422, 1749715159, 1751288021, 1753467414, 1755158905, 1757259017, 1771722827, 1786534215, 1797645367, 1803929812, 1807501636, 1853642948, 1865773108, 1873350948, 1887579800, 1898223949, 1900544002, 1904285766, 1907435316, 1925844629, 1939219752, 1966223078, 1968053806, 1971465813, 1971703386, 1973420034, 1982106678, 1983533124, 1986351224, 1988502165, 1990037800, 1991350601, 1998883894, 2000439531, 2001281328, 2001349736, 2001495140, 2003183333, 2004719812, 2005279787, 2005719336, 2006036556, 2006896969, 2007781534, 2008165414, 2008994116, 2041712436, 2060065124, 2070023911, 2085266636, 2092255447, 50910499, 51957043, 52485715, 53012355, 55110883, 56680499, 57206291, 57732851, 59768833, 60345427, 60352083, 61395251, 62973651, 67633153, 893386754, 960495618, 1682547543, 1689922072, 1713515574, 1716349149, 1731545140, 1733076167, 1736576231, 1740181637, 1747814436, 1748228205, 1748607578, 1748879564, 1749656156, 1749801286, 1749917205, 1751493207, 1753343188, 1753588936, 1755076808, 1756474198, 1757146773, 1757293380, 1766632184, 1773808452, 1783388497, 1797361975, 1797585096, 1798677556, 1803876550, 1805233752, 1806806678, 1813512194, 1818755074, 1854228698, 1864368130, 1867237670, 1870268949, 1874102998, 1881669634, 1889085973, 1898223945, 1898971138, 1899694294, 1901940917, 1903761465, 1904515399, 1906135367, 1907959605, 1919418370, 1934172497, 1938173140, 1941221172, 1965334268, 1967128578, 1967795958, 1968840263, 1971461414, 1971466997, 1971628838, 1971938532, 1973040373, 1974771450, 1976348214, 1982173479, 1983002201, 1983633431, 1986140359, 1986527234, 1988486813, 1988763672, 1989812374, 1990074116, 1990969577, 1991909525, 1998724870, 1999397992, 2000158722, 2000525512, 2000965834, 2001309869, 2001349720, 2001392795, 2001392798, 2002780162, 2003062853, 2004557973, 2004635806, 2005160150, 2005231925, 2005324101, 2005543979, 2005766372, 2006028454, 2006329158, 2006592552, 2006974466, 2007601444, 2007803172, 2008133709, 2008325940, 2008851557, 2009276567, 2021937364, 2051837468, 2055515017, 2066000646, 2068523856, 2072193862, 2083120164, 2087012585, 2091479332, 2092557349, 50908899, 50916387, 51438659, 51961587, 51965683, 52486755, 52490899, 54054451, 55104723, 55111395, 56677619, 56682579, 57205395, 57207619, 57731155, 57733651, 59244545, 59821379, 60345171, 60347747, 60351123, 60352339, 60875283, 61925907, 62450211, 62974707, 67108865, 68681729, 876609538, 910163970, 943718402, 1679960596, 1682186266, 1685703382, 1686491348, 1699324759, 1703936002, 1713736758, 1715310660, 1719741029, 1730965751, 1732069431, 1733054663, 1733372532, 1736200310, 1736576583, 1738539010, 1747048757, 1747306711, 1747838298, 1748225318, 1748346119, 1748359220, 1748621670, 1748846791, 1749272732, 1749649513, 1749673195, 1749723735, 1749813486, 1749905526, 1749932347, 1751386406, 1752979652, 1753319686, 1753362711, 1753479494, 1754031332, 1754894485, 1755148615, 1756098852, 1756600614, 1757137429, 1757157700, 1757268168, 1758044696, 1765431364, 1766992520, 1773295687, 1781815495, 1783210839, 1783388498, 1790207270, 1797368887, 1797544247, 1797628983, 1798417460, 1798686984, 1800730821, 1803876557, 1803929861, 1805502724, 1806799156, 1806981428, 1807599880, 1817013469, 1818700314, 1820327938, 1854228692, 1854245076, 1857653029, 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, 1970798594, 1971457766 }; +static int32_t const ELEMENT_HASHES_DATA[] = { 1914900309, 1753057319, 2001349704, 1681770564, 1818700314, 1982935782, 2007257240, 58773795, 1747176599, 1783210839, 1898130486, 1971457766, 1990969429, 2005181733, 2055514836, 54061139, 62390273, 1730150402, 1749395095, 1757137429, 1800730821, 1870135298, 1903302038, 1965115924, 1971981018, 1988486811, 1999745104, 2002882873, 2005925890, 2008340774, 2082727685, 51965171, 57200451, 60350803, 69730305, 1703292116, 1733890180, 1748355193, 1749813541, 1754894485, 1765431364, 1797544247, 1806799156, 1857653029, 1881613047, 1899272521, 1906087319, 1938172967, 1967795910, 1971467002, 1974775352, 1984294038, 1988972590, 1998585858, 2000825752, 2001392796, 2004557976, 2005543977, 2006560839, 2008125638, 2009706573, 2068523853, 2087049448, 51434643, 52488851, 56151587, 57210387, 59826259, 60354131, 63438849, 926941186, 1686489160, 1715300574, 1732381397, 1737099991, 1748100148, 1748642422, 1749715159, 1751288021, 1753479494, 1756098852, 1757268168, 1773295687, 1790207270, 1798417460, 1803929861, 1807599880, 1854228692, 1867061545, 1874053333, 1887743720, 1898753862, 1900845386, 1904412884, 1907661127, 1932928296, 1941178676, 1966386470, 1968836118, 1971465813, 1971703386, 1973420034, 1982106678, 1983533124, 1986351224, 1988502165, 1990037800, 1991350601, 1998883894, 2000439531, 2001281328, 2001349736, 2001495140, 2003183333, 2004719812, 2005279787, 2005719336, 2006036556, 2006896969, 2007781534, 2008165414, 2008994116, 2041712436, 2060065124, 2070023911, 2085266636, 2092255447, 50910499, 51957043, 52485715, 53012355, 55110883, 56680499, 57206291, 57732851, 59768833, 60345427, 60352083, 61395251, 62973651, 67633153, 893386754, 960495618, 1682547543, 1689922072, 1713515574, 1716349149, 1731545140, 1733076167, 1736576231, 1740181637, 1747814436, 1748228205, 1748607578, 1748879564, 1749656156, 1749801286, 1749917205, 1751493207, 1753343188, 1754031332, 1755148615, 1756600614, 1757157700, 1758044696, 1766992520, 1781815495, 1783388498, 1797368887, 1797628983, 1798686984, 1803876557, 1805502724, 1806981428, 1817013469, 1820327938, 1854245076, 1865714391, 1868312196, 1873281026, 1881288348, 1884120164, 1897398274, 1898223946, 1899170008, 1899796819, 1902116866, 1904283860, 1904946933, 1907085604, 1908709605, 1925049415, 1935549734, 1938817026, 1948778498, 1965634084, 1967760215, 1967957189, 1970798594, 1971461414, 1971466997, 1971628838, 1971938532, 1973040373, 1974771450, 1976348214, 1982173479, 1983002201, 1983633431, 1986140359, 1986527234, 1988486813, 1988763672, 1989812374, 1990074116, 1990969577, 1991909525, 1998724870, 1999397992, 2000158722, 2000525512, 2000965834, 2001309869, 2001349720, 2001392795, 2001392798, 2002780162, 2003062853, 2004557973, 2004635806, 2005160150, 2005231925, 2005324101, 2005543979, 2005766372, 2006028454, 2006329158, 2006592552, 2006974466, 2007601444, 2007803172, 2008133709, 2008325940, 2008851557, 2009276567, 2021937364, 2051837468, 2055515017, 2066000646, 2068523856, 2072193862, 2083120164, 2087012585, 2091479332, 2092557349, 50908899, 50916387, 51438659, 51961587, 51965683, 52486755, 52490899, 54054451, 55104723, 55111395, 56677619, 56682579, 57205395, 57207619, 57731155, 57733651, 59244545, 59821379, 60345171, 60347747, 60351123, 60352339, 60875283, 61925907, 62450211, 62974707, 67108865, 68681729, 876609538, 910163970, 943718402, 1679960596, 1682186266, 1685703382, 1686491348, 1699324759, 1703936002, 1713736758, 1715310660, 1719741029, 1730965751, 1732069431, 1733054663, 1733372532, 1736200310, 1736576583, 1738539010, 1747048757, 1747306711, 1747838298, 1748225318, 1748346119, 1748359220, 1748621670, 1748846791, 1749272732, 1749649513, 1749673195, 1749723735, 1749813486, 1749905526, 1749932347, 1751386406, 1752979652, 1753319686, 1753467414, 1753588936, 1754634617, 1755076808, 1755158905, 1756474198, 1756625221, 1757146773, 1757259017, 1757293380, 1763839627, 1766632184, 1771722827, 1773808452, 1782357526, 1783388497, 1786534215, 1797361975, 1797540167, 1797585096, 1797645367, 1798677556, 1798693940, 1803876550, 1803929812, 1805233752, 1805647874, 1806806678, 1807501636, 1813512194, 1818230786, 1818755074, 1853642948, 1854228698, 1857622310, 1864368130, 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, 1968840263, 1970938456 }; staticJArray nsHtml5ElementName::ELEMENT_HASHES = { ELEMENT_HASHES_DATA, MOZ_ARRAY_LENGTH(ELEMENT_HASHES_DATA) }; void nsHtml5ElementName::initializeStatics() @@ -624,7 +623,6 @@ nsHtml5ElementName::initializeStatics() ELT_LOGBASE = new nsHtml5ElementName(nsHtml5Atoms::logbase, nsHtml5Atoms::logbase, NS_NewHTMLUnknownElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::OTHER); ELT_MSPACE = new nsHtml5ElementName(nsHtml5Atoms::mspace, nsHtml5Atoms::mspace, NS_NewHTMLUnknownElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::OTHER); ELT_MODE = new nsHtml5ElementName(nsHtml5Atoms::mode, nsHtml5Atoms::mode, NS_NewHTMLUnknownElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::OTHER); - ELT_MARQUEE = new nsHtml5ElementName(nsHtml5Atoms::marquee, nsHtml5Atoms::marquee, NS_NewHTMLDivElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::MARQUEE_OR_APPLET | SPECIAL | SCOPING); ELT_MTABLE = new nsHtml5ElementName(nsHtml5Atoms::mtable, nsHtml5Atoms::mtable, NS_NewHTMLUnknownElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::OTHER); ELT_MSTYLE = new nsHtml5ElementName(nsHtml5Atoms::mstyle, nsHtml5Atoms::mstyle, NS_NewHTMLUnknownElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::OTHER); ELT_MENCLOSE = new nsHtml5ElementName(nsHtml5Atoms::menclose, nsHtml5Atoms::menclose, NS_NewHTMLUnknownElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::OTHER); @@ -893,19 +891,19 @@ nsHtml5ElementName::initializeStatics() ELT_RUBY = new nsHtml5ElementName(nsHtml5Atoms::ruby, nsHtml5Atoms::ruby, NS_NewHTMLElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR); ELT_SUMMARY = new nsHtml5ElementName(nsHtml5Atoms::summary, nsHtml5Atoms::summary, NS_NewHTMLSummaryElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::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); ELT_TBODY = new nsHtml5ElementName(nsHtml5Atoms::tbody, nsHtml5Atoms::tbody, NS_NewHTMLTableSectionElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); - ELEMENT_NAMES = new nsHtml5ElementName*[400]; - ELEMENT_NAMES[0] = ELT_VKERN; + ELEMENT_NAMES = new nsHtml5ElementName*[399]; + ELEMENT_NAMES[0] = ELT_AUDIO; ELEMENT_NAMES[1] = ELT_LOGBASE; ELEMENT_NAMES[2] = ELT_FIELDSET; ELEMENT_NAMES[3] = ELT_DATA; - ELEMENT_NAMES[4] = ELT_LI; + ELEMENT_NAMES[4] = ELT_IMAGINARYI; ELEMENT_NAMES[5] = ELT_CANVAS; ELEMENT_NAMES[6] = ELT_QUOTIENT; ELEMENT_NAMES[7] = ELT_PRE; ELEMENT_NAMES[8] = ELT_ARTICLE; - ELEMENT_NAMES[9] = ELT_DIALOG; - ELEMENT_NAMES[10] = ELT_ARCTAN; - ELEMENT_NAMES[11] = ELT_LISTENER; + ELEMENT_NAMES[9] = ELT_FEFUNCG; + ELEMENT_NAMES[10] = ELT_ARCSIN; + ELEMENT_NAMES[11] = ELT_MUNDER; ELEMENT_NAMES[12] = ELT_REALS; ELEMENT_NAMES[13] = ELT_MROOT; ELEMENT_NAMES[14] = ELT_MROW; @@ -913,11 +911,11 @@ nsHtml5ElementName::initializeStatics() ELEMENT_NAMES[16] = ELT_G; ELEMENT_NAMES[17] = ELT_DD; ELEMENT_NAMES[18] = ELT_ELLIPSE; - ELEMENT_NAMES[19] = ELT_STYLE; - ELEMENT_NAMES[20] = ELT_COTH; - ELEMENT_NAMES[21] = ELT_INTERVAL; - ELEMENT_NAMES[22] = ELT_MN; - ELEMENT_NAMES[23] = ELT_BR; + ELEMENT_NAMES[19] = ELT_TABLE; + ELEMENT_NAMES[20] = ELT_GLYPH; + ELEMENT_NAMES[21] = ELT_OL; + ELEMENT_NAMES[22] = ELT_KEYGEN; + ELEMENT_NAMES[23] = ELT_ABBR; ELEMENT_NAMES[24] = ELT_NOTANUMBER; ELEMENT_NAMES[25] = ELT_MPRESCRIPTS; ELEMENT_NAMES[26] = ELT_CARTESIANPRODUCT; @@ -933,16 +931,16 @@ nsHtml5ElementName::initializeStatics() ELEMENT_NAMES[36] = ELT_HEAD; ELEMENT_NAMES[37] = ELT_CONJUGATE; ELEMENT_NAMES[38] = ELT_FRAME; - ELEMENT_NAMES[39] = ELT_OTHERWISE; - ELEMENT_NAMES[40] = ELT_ALTGLYPHDEF; - ELEMENT_NAMES[41] = ELT_ARCTANH; - ELEMENT_NAMES[42] = ELT_TH; - ELEMENT_NAMES[43] = ELT_TBREAK; - ELEMENT_NAMES[44] = ELT_ANIMATETRANSFORM; - ELEMENT_NAMES[45] = ELT_CAPTION; - ELEMENT_NAMES[46] = ELT_OPTION; - ELEMENT_NAMES[47] = ELT_MALIGNGROUP; - ELEMENT_NAMES[48] = ELT_FECOMPONENTTRANSFER; + ELEMENT_NAMES[39] = ELT_PIECE; + ELEMENT_NAMES[40] = ELT_DIFF; + ELEMENT_NAMES[41] = ELT_ARCSINH; + ELEMENT_NAMES[42] = ELT_SECH; + ELEMENT_NAMES[43] = ELT_TRACK; + ELEMENT_NAMES[44] = ELT_ACRONYM; + ELEMENT_NAMES[45] = ELT_CONDITION; + ELEMENT_NAMES[46] = ELT_POLYGON; + ELEMENT_NAMES[47] = ELT_MSUBSUP; + ELEMENT_NAMES[48] = ELT_FILTER; ELEMENT_NAMES[49] = ELT_MUNDEROVER; ELEMENT_NAMES[50] = ELT_SELECTOR; ELEMENT_NAMES[51] = ELT_EXISTS; @@ -973,26 +971,26 @@ nsHtml5ElementName::initializeStatics() ELEMENT_NAMES[76] = ELT_DEGREE; ELEMENT_NAMES[77] = ELT_FEIMAGE; ELEMENT_NAMES[78] = ELT_IMAGE; - ELEMENT_NAMES[79] = ELT_MTABLE; - ELEMENT_NAMES[80] = ELT_PIECEWISE; - ELEMENT_NAMES[81] = ELT_TRANSPOSE; - ELEMENT_NAMES[82] = ELT_PARTIALDIFF; - ELEMENT_NAMES[83] = ELT_LISTING; - ELEMENT_NAMES[84] = ELT_ARCCOTH; - ELEMENT_NAMES[85] = ELT_MATH; - ELEMENT_NAMES[86] = ELT_TANH; - ELEMENT_NAMES[87] = ELT_LINK; - ELEMENT_NAMES[88] = ELT_CURL; - ELEMENT_NAMES[89] = ELT_REAL; - ELEMENT_NAMES[90] = ELT_MENUITEM; - ELEMENT_NAMES[91] = ELT_ANIMATEMOTION; - ELEMENT_NAMES[92] = ELT_IN; - ELEMENT_NAMES[93] = ELT_MEDIAN; - ELEMENT_NAMES[94] = ELT_SPAN; - ELEMENT_NAMES[95] = ELT_VIDEO; - ELEMENT_NAMES[96] = ELT_OPTGROUP; - ELEMENT_NAMES[97] = ELT_CENTER; - ELEMENT_NAMES[98] = ELT_FEGAUSSIANBLUR; + ELEMENT_NAMES[79] = ELT_MSTYLE; + ELEMENT_NAMES[80] = ELT_RULE; + ELEMENT_NAMES[81] = ELT_TEMPLATE; + ELEMENT_NAMES[82] = ELT_SETDIFF; + ELEMENT_NAMES[83] = ELT_STRONG; + ELEMENT_NAMES[84] = ELT_CSCH; + ELEMENT_NAMES[85] = ELT_MPATH; + ELEMENT_NAMES[86] = ELT_TEXTPATH; + ELEMENT_NAMES[87] = ELT_MARK; + ELEMENT_NAMES[88] = ELT_FACTORIAL; + ELEMENT_NAMES[89] = ELT_SMALL; + ELEMENT_NAMES[90] = ELT_MPHANTOM; + ELEMENT_NAMES[91] = ELT_BUTTON; + ELEMENT_NAMES[92] = ELT_FIGCAPTION; + ELEMENT_NAMES[93] = ELT_MAIN; + ELEMENT_NAMES[94] = ELT_SECTION; + ELEMENT_NAMES[95] = ELT_COLGROUP; + ELEMENT_NAMES[96] = ELT_SAMP; + ELEMENT_NAMES[97] = ELT_CURSOR; + ELEMENT_NAMES[98] = ELT_HEADER; ELEMENT_NAMES[99] = ELT_METER; ELEMENT_NAMES[100] = ELT_MLABELEDTR; ELEMENT_NAMES[101] = ELT_TR; @@ -1054,45 +1052,45 @@ nsHtml5ElementName::initializeStatics() ELEMENT_NAMES[157] = ELT_FALSE; ELEMENT_NAMES[158] = ELT_INVERSE; ELEMENT_NAMES[159] = ELT_MODE; - ELEMENT_NAMES[160] = ELT_MENCLOSE; - ELEMENT_NAMES[161] = ELT_POLYLINE; - ELEMENT_NAMES[162] = ELT_SOURCE; - ELEMENT_NAMES[163] = ELT_TITLE; - ELEMENT_NAMES[164] = ELT_TRUE; - ELEMENT_NAMES[165] = ELT_FACTOROF; - ELEMENT_NAMES[166] = ELT_TREF; - ELEMENT_NAMES[167] = ELT_FEDIFFUSELIGHTING; - ELEMENT_NAMES[168] = ELT_ARCSECH; - ELEMENT_NAMES[169] = ELT_ALTGLYPH; - ELEMENT_NAMES[170] = ELT_COSH; - ELEMENT_NAMES[171] = ELT_MGLYPH; - ELEMENT_NAMES[172] = ELT_PREFETCH; - ELEMENT_NAMES[173] = ELT_SWITCH; - ELEMENT_NAMES[174] = ELT_CI; - ELEMENT_NAMES[175] = ELT_MI; - ELEMENT_NAMES[176] = ELT_MALIGNMARK; - ELEMENT_NAMES[177] = ELT_DL; - ELEMENT_NAMES[178] = ELT_FORALL; - ELEMENT_NAMES[179] = ELT_LABEL; - ELEMENT_NAMES[180] = ELT_SYMBOL; - ELEMENT_NAMES[181] = ELT_EM; - ELEMENT_NAMES[182] = ELT_PARAM; - ELEMENT_NAMES[183] = ELT_ANIMATION; - ELEMENT_NAMES[184] = ELT_FN; - ELEMENT_NAMES[185] = ELT_DOMAIN; - ELEMENT_NAMES[186] = ELT_HKERN; - ELEMENT_NAMES[187] = ELT_LAPLACIAN; - ELEMENT_NAMES[188] = ELT_MACTION; - ELEMENT_NAMES[189] = ELT_PATTERN; - ELEMENT_NAMES[190] = ELT_TSPAN; - ELEMENT_NAMES[191] = ELT_MO; - ELEMENT_NAMES[192] = ELT_FEDISPLACEMENTMAP; - ELEMENT_NAMES[193] = ELT_MSUP; - ELEMENT_NAMES[194] = ELT_STOP; - ELEMENT_NAMES[195] = ELT_ANIMATECOLOR; - ELEMENT_NAMES[196] = ELT_HR; - ELEMENT_NAMES[197] = ELT_FOOTER; - ELEMENT_NAMES[198] = ELT_HANDLER; + ELEMENT_NAMES[160] = ELT_NONE; + ELEMENT_NAMES[161] = ELT_PICTURE; + ELEMENT_NAMES[162] = ELT_STRIKE; + ELEMENT_NAMES[163] = ELT_TIME; + ELEMENT_NAMES[164] = ELT_VARIANCE; + ELEMENT_NAMES[165] = ELT_GLYPHREF; + ELEMENT_NAMES[166] = ELT_CEILING; + ELEMENT_NAMES[167] = ELT_FESPECULARLIGHTING; + ELEMENT_NAMES[168] = ELT_ARCCSCH; + ELEMENT_NAMES[169] = ELT_ARCCOSH; + ELEMENT_NAMES[170] = ELT_CLIPPATH; + ELEMENT_NAMES[171] = ELT_MISSING_GLYPH; + ELEMENT_NAMES[172] = ELT_PATH; + ELEMENT_NAMES[173] = ELT_SINH; + ELEMENT_NAMES[174] = ELT_FONT_FACE_URI; + ELEMENT_NAMES[175] = ELT_PI; + ELEMENT_NAMES[176] = ELT_MASK; + ELEMENT_NAMES[177] = ELT_CSYMBOL; + ELEMENT_NAMES[178] = ELT_HTML; + ELEMENT_NAMES[179] = ELT_UL; + ELEMENT_NAMES[180] = ELT_ALTGLYPHITEM; + ELEMENT_NAMES[181] = ELT_FORM; + ELEMENT_NAMES[182] = ELT_CN; + ELEMENT_NAMES[183] = ELT_ANNOTATION; + ELEMENT_NAMES[184] = ELT_CODOMAIN; + ELEMENT_NAMES[185] = ELT_DOMAINOFAPPLICATION; + ELEMENT_NAMES[186] = ELT_LN; + ELEMENT_NAMES[187] = ELT_MEAN; + ELEMENT_NAMES[188] = ELT_NOTIN; + ELEMENT_NAMES[189] = ELT_RELN; + ELEMENT_NAMES[190] = ELT_UNION; + ELEMENT_NAMES[191] = ELT_TENDSTO; + ELEMENT_NAMES[192] = ELT_HGROUP; + ELEMENT_NAMES[193] = ELT_RP; + ELEMENT_NAMES[194] = ELT_EQ; + ELEMENT_NAMES[195] = ELT_BVAR; + ELEMENT_NAMES[196] = ELT_FEFUNCR; + ELEMENT_NAMES[197] = ELT_FLOOR; + ELEMENT_NAMES[198] = ELT_OR; ELEMENT_NAMES[199] = ELT_MARKER; ELEMENT_NAMES[200] = ELT_MOVER; ELEMENT_NAMES[201] = ELT_MERROR; @@ -1214,86 +1212,85 @@ nsHtml5ElementName::initializeStatics() ELEMENT_NAMES[317] = ELT_IFRAME; ELEMENT_NAMES[318] = ELT_LINE; ELEMENT_NAMES[319] = ELT_MSPACE; - ELEMENT_NAMES[320] = ELT_MARQUEE; - ELEMENT_NAMES[321] = ELT_MSTYLE; - ELEMENT_NAMES[322] = ELT_NONE; - ELEMENT_NAMES[323] = ELT_PIECE; - ELEMENT_NAMES[324] = ELT_PICTURE; - ELEMENT_NAMES[325] = ELT_RULE; - ELEMENT_NAMES[326] = ELT_STRIKE; - ELEMENT_NAMES[327] = ELT_TABLE; - ELEMENT_NAMES[328] = ELT_TIME; - ELEMENT_NAMES[329] = ELT_TEMPLATE; - ELEMENT_NAMES[330] = ELT_VARIANCE; - ELEMENT_NAMES[331] = ELT_DIFF; - ELEMENT_NAMES[332] = ELT_GLYPHREF; - ELEMENT_NAMES[333] = ELT_SETDIFF; - ELEMENT_NAMES[334] = ELT_CEILING; - ELEMENT_NAMES[335] = ELT_FEFUNCG; - ELEMENT_NAMES[336] = ELT_FESPECULARLIGHTING; - ELEMENT_NAMES[337] = ELT_STRONG; - ELEMENT_NAMES[338] = ELT_ARCCSCH; - ELEMENT_NAMES[339] = ELT_ARCSINH; - ELEMENT_NAMES[340] = ELT_ARCCOSH; - ELEMENT_NAMES[341] = ELT_CSCH; - ELEMENT_NAMES[342] = ELT_CLIPPATH; - ELEMENT_NAMES[343] = ELT_GLYPH; - ELEMENT_NAMES[344] = ELT_MISSING_GLYPH; - ELEMENT_NAMES[345] = ELT_MPATH; - ELEMENT_NAMES[346] = ELT_PATH; - ELEMENT_NAMES[347] = ELT_SECH; - ELEMENT_NAMES[348] = ELT_SINH; - ELEMENT_NAMES[349] = ELT_TEXTPATH; - ELEMENT_NAMES[350] = ELT_FONT_FACE_URI; - ELEMENT_NAMES[351] = ELT_IMAGINARYI; - ELEMENT_NAMES[352] = ELT_PI; - ELEMENT_NAMES[353] = ELT_MARK; - ELEMENT_NAMES[354] = ELT_MASK; - ELEMENT_NAMES[355] = ELT_TRACK; - ELEMENT_NAMES[356] = ELT_CSYMBOL; - ELEMENT_NAMES[357] = ELT_FACTORIAL; - ELEMENT_NAMES[358] = ELT_HTML; - ELEMENT_NAMES[359] = ELT_OL; - ELEMENT_NAMES[360] = ELT_UL; - ELEMENT_NAMES[361] = ELT_SMALL; - ELEMENT_NAMES[362] = ELT_ALTGLYPHITEM; - ELEMENT_NAMES[363] = ELT_ACRONYM; - ELEMENT_NAMES[364] = ELT_FORM; - ELEMENT_NAMES[365] = ELT_MPHANTOM; - ELEMENT_NAMES[366] = ELT_CN; - ELEMENT_NAMES[367] = ELT_ARCSIN; - ELEMENT_NAMES[368] = ELT_ANNOTATION; - ELEMENT_NAMES[369] = ELT_BUTTON; - ELEMENT_NAMES[370] = ELT_CODOMAIN; - ELEMENT_NAMES[371] = ELT_CONDITION; - ELEMENT_NAMES[372] = ELT_DOMAINOFAPPLICATION; - ELEMENT_NAMES[373] = ELT_FIGCAPTION; - ELEMENT_NAMES[374] = ELT_LN; - ELEMENT_NAMES[375] = ELT_KEYGEN; - ELEMENT_NAMES[376] = ELT_MEAN; - ELEMENT_NAMES[377] = ELT_MAIN; - ELEMENT_NAMES[378] = ELT_NOTIN; - ELEMENT_NAMES[379] = ELT_POLYGON; - ELEMENT_NAMES[380] = ELT_RELN; - ELEMENT_NAMES[381] = ELT_SECTION; - ELEMENT_NAMES[382] = ELT_UNION; - ELEMENT_NAMES[383] = ELT_AUDIO; - ELEMENT_NAMES[384] = ELT_TENDSTO; - ELEMENT_NAMES[385] = ELT_COLGROUP; - ELEMENT_NAMES[386] = ELT_HGROUP; - ELEMENT_NAMES[387] = ELT_MSUBSUP; - ELEMENT_NAMES[388] = ELT_RP; - ELEMENT_NAMES[389] = ELT_SAMP; - ELEMENT_NAMES[390] = ELT_EQ; - ELEMENT_NAMES[391] = ELT_ABBR; - ELEMENT_NAMES[392] = ELT_BVAR; - ELEMENT_NAMES[393] = ELT_CURSOR; - ELEMENT_NAMES[394] = ELT_FEFUNCR; - ELEMENT_NAMES[395] = ELT_FILTER; - ELEMENT_NAMES[396] = ELT_FLOOR; - ELEMENT_NAMES[397] = ELT_HEADER; - ELEMENT_NAMES[398] = ELT_OR; - ELEMENT_NAMES[399] = ELT_MUNDER; + ELEMENT_NAMES[320] = ELT_MTABLE; + ELEMENT_NAMES[321] = ELT_MENCLOSE; + ELEMENT_NAMES[322] = ELT_OTHERWISE; + ELEMENT_NAMES[323] = ELT_POLYLINE; + ELEMENT_NAMES[324] = ELT_PIECEWISE; + ELEMENT_NAMES[325] = ELT_SOURCE; + ELEMENT_NAMES[326] = ELT_STYLE; + ELEMENT_NAMES[327] = ELT_TITLE; + ELEMENT_NAMES[328] = ELT_TRANSPOSE; + ELEMENT_NAMES[329] = ELT_TRUE; + ELEMENT_NAMES[330] = ELT_ALTGLYPHDEF; + ELEMENT_NAMES[331] = ELT_FACTOROF; + ELEMENT_NAMES[332] = ELT_PARTIALDIFF; + ELEMENT_NAMES[333] = ELT_TREF; + ELEMENT_NAMES[334] = ELT_DIALOG; + ELEMENT_NAMES[335] = ELT_FEDIFFUSELIGHTING; + ELEMENT_NAMES[336] = ELT_LISTING; + ELEMENT_NAMES[337] = ELT_ARCSECH; + ELEMENT_NAMES[338] = ELT_ARCTANH; + ELEMENT_NAMES[339] = ELT_ALTGLYPH; + ELEMENT_NAMES[340] = ELT_ARCCOTH; + ELEMENT_NAMES[341] = ELT_COSH; + ELEMENT_NAMES[342] = ELT_COTH; + ELEMENT_NAMES[343] = ELT_MGLYPH; + ELEMENT_NAMES[344] = ELT_MATH; + ELEMENT_NAMES[345] = ELT_PREFETCH; + ELEMENT_NAMES[346] = ELT_TH; + ELEMENT_NAMES[347] = ELT_SWITCH; + ELEMENT_NAMES[348] = ELT_TANH; + ELEMENT_NAMES[349] = ELT_CI; + ELEMENT_NAMES[350] = ELT_LI; + ELEMENT_NAMES[351] = ELT_MI; + ELEMENT_NAMES[352] = ELT_LINK; + ELEMENT_NAMES[353] = ELT_MALIGNMARK; + ELEMENT_NAMES[354] = ELT_TBREAK; + ELEMENT_NAMES[355] = ELT_DL; + ELEMENT_NAMES[356] = ELT_CURL; + ELEMENT_NAMES[357] = ELT_FORALL; + ELEMENT_NAMES[358] = ELT_INTERVAL; + ELEMENT_NAMES[359] = ELT_LABEL; + ELEMENT_NAMES[360] = ELT_REAL; + ELEMENT_NAMES[361] = ELT_SYMBOL; + ELEMENT_NAMES[362] = ELT_ANIMATETRANSFORM; + ELEMENT_NAMES[363] = ELT_EM; + ELEMENT_NAMES[364] = ELT_MENUITEM; + ELEMENT_NAMES[365] = ELT_PARAM; + ELEMENT_NAMES[366] = ELT_ARCTAN; + ELEMENT_NAMES[367] = ELT_ANIMATION; + ELEMENT_NAMES[368] = ELT_ANIMATEMOTION; + ELEMENT_NAMES[369] = ELT_FN; + ELEMENT_NAMES[370] = ELT_CAPTION; + ELEMENT_NAMES[371] = ELT_DOMAIN; + ELEMENT_NAMES[372] = ELT_IN; + ELEMENT_NAMES[373] = ELT_HKERN; + ELEMENT_NAMES[374] = ELT_MN; + ELEMENT_NAMES[375] = ELT_LAPLACIAN; + ELEMENT_NAMES[376] = ELT_MEDIAN; + ELEMENT_NAMES[377] = ELT_MACTION; + ELEMENT_NAMES[378] = ELT_OPTION; + ELEMENT_NAMES[379] = ELT_PATTERN; + ELEMENT_NAMES[380] = ELT_SPAN; + ELEMENT_NAMES[381] = ELT_TSPAN; + ELEMENT_NAMES[382] = ELT_VKERN; + ELEMENT_NAMES[383] = ELT_MO; + ELEMENT_NAMES[384] = ELT_VIDEO; + ELEMENT_NAMES[385] = ELT_FEDISPLACEMENTMAP; + ELEMENT_NAMES[386] = ELT_MALIGNGROUP; + ELEMENT_NAMES[387] = ELT_MSUP; + ELEMENT_NAMES[388] = ELT_OPTGROUP; + ELEMENT_NAMES[389] = ELT_STOP; + ELEMENT_NAMES[390] = ELT_BR; + ELEMENT_NAMES[391] = ELT_ANIMATECOLOR; + ELEMENT_NAMES[392] = ELT_CENTER; + ELEMENT_NAMES[393] = ELT_HR; + ELEMENT_NAMES[394] = ELT_FECOMPONENTTRANSFER; + ELEMENT_NAMES[395] = ELT_FOOTER; + ELEMENT_NAMES[396] = ELT_FEGAUSSIANBLUR; + ELEMENT_NAMES[397] = ELT_HANDLER; + ELEMENT_NAMES[398] = ELT_LISTENER; } void @@ -1431,7 +1428,6 @@ nsHtml5ElementName::releaseStatics() delete ELT_LOGBASE; delete ELT_MSPACE; delete ELT_MODE; - delete ELT_MARQUEE; delete ELT_MTABLE; delete ELT_MSTYLE; delete ELT_MENCLOSE; diff --git a/parser/html/nsHtml5ElementName.h b/parser/html/nsHtml5ElementName.h index 131b9e628..97d6d8d5e 100644 --- a/parser/html/nsHtml5ElementName.h +++ b/parser/html/nsHtml5ElementName.h @@ -340,7 +340,6 @@ class nsHtml5ElementName static nsHtml5ElementName* ELT_LOGBASE; static nsHtml5ElementName* ELT_MSPACE; static nsHtml5ElementName* ELT_MODE; - static nsHtml5ElementName* ELT_MARQUEE; static nsHtml5ElementName* ELT_MTABLE; static nsHtml5ElementName* ELT_MSTYLE; static nsHtml5ElementName* ELT_MENCLOSE; diff --git a/parser/htmlparser/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h index 6f2316ac7..4cb2a61e0 100644 --- a/parser/htmlparser/nsHTMLTagList.h +++ b/parser/htmlparser/nsHTMLTagList.h @@ -119,7 +119,6 @@ HTML_TAG(listing, Pre, Pre) HTML_HTMLELEMENT_TAG(main) HTML_TAG(map, Map, Map) HTML_HTMLELEMENT_TAG(mark) -HTML_TAG(marquee, Div, Div) HTML_TAG(menu, Menu, Menu) HTML_TAG(menuitem, MenuItem, MenuItem) HTML_TAG(meta, Meta, Meta) -- cgit v1.2.3