From 1da42403ec84fcbb634a816bec0618e47d5e0b70 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 5 Sep 2020 18:44:16 +0000 Subject: Issue #1525 - Kill marquee element (uplift) --- .../java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java | 2 -- parser/html/nsHtml5AtomList.h | 1 - parser/html/nsHtml5ElementName.h | 1 - parser/htmlparser/nsHTMLTagList.h | 1 - 4 files changed, 5 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 ee0493318..65af61a91 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 @@ -690,7 +690,6 @@ public final class ElementName public static final ElementName LISTING = new ElementName("listing", "listing", TreeBuilder.PRE_OR_LISTING | SPECIAL); public static final ElementName MFENCED = new ElementName("mfenced", "mfenced", TreeBuilder.OTHER); public static final ElementName MPADDED = new ElementName("mpadded", "mpadded", TreeBuilder.OTHER); - public static final ElementName MARQUEE = new ElementName("marquee", "marquee", TreeBuilder.MARQUEE_OR_APPLET | SPECIAL | SCOPING); public static final ElementName MACTION = new ElementName("maction", "maction", TreeBuilder.OTHER); public static final ElementName MSUBSUP = new ElementName("msubsup", "msubsup", TreeBuilder.OTHER); public static final ElementName NOEMBED = new ElementName("noembed", "noembed", TreeBuilder.NOEMBED | SPECIAL); @@ -1089,7 +1088,6 @@ public final class ElementName LISTING, MFENCED, MPADDED, - MARQUEE, MACTION, MSUBSUP, NOEMBED, diff --git a/parser/html/nsHtml5AtomList.h b/parser/html/nsHtml5AtomList.h index ce9fcd682..26ceff4b1 100644 --- a/parser/html/nsHtml5AtomList.h +++ b/parser/html/nsHtml5AtomList.h @@ -940,7 +940,6 @@ HTML5_ATOM(logbase, "logbase") HTML5_ATOM(listing, "listing") HTML5_ATOM(mfenced, "mfenced") HTML5_ATOM(mpadded, "mpadded") -HTML5_ATOM(marquee, "marquee") HTML5_ATOM(maction, "maction") HTML5_ATOM(msubsup, "msubsup") HTML5_ATOM(picture, "picture") diff --git a/parser/html/nsHtml5ElementName.h b/parser/html/nsHtml5ElementName.h index 99c6de323..db4427be9 100644 --- a/parser/html/nsHtml5ElementName.h +++ b/parser/html/nsHtml5ElementName.h @@ -358,7 +358,6 @@ class nsHtml5ElementName static nsHtml5ElementName* ELT_LISTING; static nsHtml5ElementName* ELT_MFENCED; static nsHtml5ElementName* ELT_MPADDED; - static nsHtml5ElementName* ELT_MARQUEE; static nsHtml5ElementName* ELT_MACTION; static nsHtml5ElementName* ELT_MSUBSUP; static nsHtml5ElementName* ELT_NOEMBED; diff --git a/parser/htmlparser/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h index 7e1e207cc..62e1d2eb3 100644 --- a/parser/htmlparser/nsHTMLTagList.h +++ b/parser/htmlparser/nsHTMLTagList.h @@ -110,7 +110,6 @@ HTML_TAG(listing, Pre) HTML_HTMLELEMENT_TAG(main) HTML_TAG(map, Map) HTML_HTMLELEMENT_TAG(mark) -HTML_TAG(marquee, Div) HTML_TAG(menu, Menu) HTML_TAG(menuitem, MenuItem) HTML_TAG(meta, Meta) -- cgit v1.2.3 From c2b91aaf8cbb8f263bb335d4e6b8c37de72cfc14 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 30 Aug 2020 20:49:07 -0400 Subject: Regenerate Parser for Marquee Removal --- .../nu/validator/htmlparser/impl/ElementName.java | 1 - parser/html/nsHtml5ElementName.cpp | 248 ++++++++++----------- 2 files changed, 122 insertions(+), 127 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 65af61a91..e96e0ad80 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 @@ -1487,7 +1487,6 @@ public final class ElementName 247707956, 248648814, 248648836, - 248682161, 248986932, 249058914, 249697357, diff --git a/parser/html/nsHtml5ElementName.cpp b/parser/html/nsHtml5ElementName.cpp index f997f4781..614df1ea0 100644 --- a/parser/html/nsHtml5ElementName.cpp +++ b/parser/html/nsHtml5ElementName.cpp @@ -414,7 +414,6 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_LOGBASE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_LISTING = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MFENCED = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MPADDED = nullptr; -nsHtml5ElementName* nsHtml5ElementName::ELT_MARQUEE = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MACTION = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MSUBSUP = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_NOEMBED = nullptr; @@ -536,7 +535,7 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_FESPECULARLIGHTING = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_DOMAINOFAPPLICATION = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_FECOMPONENTTRANSFER = nullptr; nsHtml5ElementName** nsHtml5ElementName::ELEMENT_NAMES = 0; -static int32_t const ELEMENT_HASHES_DATA[] = { 1057, 1090, 1255, 1321, 1552, 1585, 1651, 1717, 68162, 68899, 69059, 69764, 70020, 70276, 71077, 71205, 72134, 72232, 72264, 72296, 72328, 72360, 72392, 73351, 74312, 75209, 78124, 78284, 78476, 79149, 79309, 79341, 79469, 81295, 81487, 82224, 84050, 84498, 84626, 86164, 86292, 86612, 86676, 87445, 3183041, 3186241, 3198017, 3218722, 3226754, 3247715, 3256803, 3263971, 3264995, 3289252, 3291332, 3295524, 3299620, 3326725, 3379303, 3392679, 3448233, 3460553, 3461577, 3510347, 3546604, 3552364, 3556524, 3576461, 3586349, 3588141, 3590797, 3596333, 3622062, 3625454, 3627054, 3675728, 3739282, 3749042, 3771059, 3771571, 3776211, 3782323, 3782963, 3784883, 3785395, 3788979, 3815476, 3839605, 3885110, 3917911, 3948984, 3951096, 135304769, 135858241, 136498210, 136906434, 137138658, 137512995, 137531875, 137548067, 137629283, 137645539, 137646563, 137775779, 138529956, 138615076, 139040932, 140954086, 141179366, 141690439, 142738600, 143013512, 146979116, 147175724, 147475756, 147902637, 147936877, 148017645, 148131885, 148228141, 148229165, 148309165, 148317229, 148395629, 148551853, 148618829, 149076462, 149490158, 149572782, 151277616, 151639440, 153268914, 153486514, 153563314, 153750706, 153763314, 153914034, 154406067, 154417459, 154600979, 154678323, 154680979, 154866835, 155366708, 155375188, 155391572, 155465780, 155869364, 158045494, 168988979, 169321621, 169652752, 173151309, 174240818, 174247297, 174669292, 175391532, 176638123, 177380397, 177879204, 177886734, 180753473, 181020073, 181503558, 181686320, 181999237, 181999311, 182048201, 182074866, 182078003, 182083764, 182920847, 184716457, 184976961, 185145071, 187281445, 187872052, 188100653, 188875944, 188919873, 188920457, 189107250, 189203987, 189371817, 189414886, 189567458, 190266670, 191318187, 191337609, 202479203, 202493027, 202835587, 202843747, 203013219, 203036048, 203045987, 203177552, 203898516, 204648562, 205067918, 205078130, 205096654, 205689142, 205690439, 205766017, 205988909, 207213161, 207794484, 207800999, 208023602, 208213644, 208213647, 210261490, 210310273, 210940978, 213325049, 213946445, 214055079, 215125040, 215134273, 215135028, 215237420, 215418148, 215553166, 215553394, 215563858, 215627949, 215754324, 217529652, 217713834, 217732628, 218731945, 221417045, 221424946, 221493746, 221515401, 221658189, 221908140, 221910626, 221921586, 222659762, 225001091, 236105833, 236113965, 236194995, 236195427, 236206132, 236206387, 236211683, 236212707, 236381647, 236571826, 237124271, 238210544, 238270764, 238435405, 238501172, 239224867, 239257644, 239710497, 240307721, 241208789, 241241557, 241318060, 241319404, 241343533, 241344069, 241405397, 241765845, 243864964, 244502085, 244946220, 245109902, 247647266, 247707956, 248648814, 248648836, 248682161, 248986932, 249058914, 249697357, 251841204, 252132601, 252135604, 252317348, 255007012, 255278388, 255641645, 256365156, 257566121, 269763372, 271202790, 271863856, 272049197, 272127474, 274339449, 274939471, 275388004, 275388005, 275388006, 275977800, 278267602, 278513831, 278712622, 281613765, 281683369, 282120228, 282250732, 282498697, 282508942, 283743649, 283787570, 284710386, 285391148, 285478533, 285854898, 285873762, 286931113, 288964227, 289445441, 289591340, 289689648, 291671489, 303512884, 305319975, 305610036, 305764101, 308448294, 308675890, 312085683, 312264750, 315032867, 316391000, 317331042, 317902135, 318950711, 319447220, 321499182, 322538804, 323145200, 337067316, 337826293, 339905989, 340833697, 341457068, 342310196, 345302593, 349554733, 349771471, 349786245, 350819405, 356072847, 370349192, 373962798, 375558638, 375574835, 376053993, 383276530, 383373833, 383407586, 384439906, 386079012, 404133513, 404307343, 407031852, 408072233, 409112005, 409608425, 409713793, 409771500, 419040932, 437730612, 439529766, 442616365, 442813037, 443157674, 443295316, 450118444, 450482697, 456789668, 459935396, 471217869, 474073645, 476230702, 476665218, 476717289, 483014825, 485083298, 489306281, 538364390, 540675748, 543819186, 543958612, 576960820, 577242548, 610515252, 642202932, 644420819 }; +static int32_t const ELEMENT_HASHES_DATA[] = { 1057, 1090, 1255, 1321, 1552, 1585, 1651, 1717, 68162, 68899, 69059, 69764, 70020, 70276, 71077, 71205, 72134, 72232, 72264, 72296, 72328, 72360, 72392, 73351, 74312, 75209, 78124, 78284, 78476, 79149, 79309, 79341, 79469, 81295, 81487, 82224, 84050, 84498, 84626, 86164, 86292, 86612, 86676, 87445, 3183041, 3186241, 3198017, 3218722, 3226754, 3247715, 3256803, 3263971, 3264995, 3289252, 3291332, 3295524, 3299620, 3326725, 3379303, 3392679, 3448233, 3460553, 3461577, 3510347, 3546604, 3552364, 3556524, 3576461, 3586349, 3588141, 3590797, 3596333, 3622062, 3625454, 3627054, 3675728, 3739282, 3749042, 3771059, 3771571, 3776211, 3782323, 3782963, 3784883, 3785395, 3788979, 3815476, 3839605, 3885110, 3917911, 3948984, 3951096, 135304769, 135858241, 136498210, 136906434, 137138658, 137512995, 137531875, 137548067, 137629283, 137645539, 137646563, 137775779, 138529956, 138615076, 139040932, 140954086, 141179366, 141690439, 142738600, 143013512, 146979116, 147175724, 147475756, 147902637, 147936877, 148017645, 148131885, 148228141, 148229165, 148309165, 148317229, 148395629, 148551853, 148618829, 149076462, 149490158, 149572782, 151277616, 151639440, 153268914, 153486514, 153563314, 153750706, 153763314, 153914034, 154406067, 154417459, 154600979, 154678323, 154680979, 154866835, 155366708, 155375188, 155391572, 155465780, 155869364, 158045494, 168988979, 169321621, 169652752, 173151309, 174240818, 174247297, 174669292, 175391532, 176638123, 177380397, 177879204, 177886734, 180753473, 181020073, 181503558, 181686320, 181999237, 181999311, 182048201, 182074866, 182078003, 182083764, 182920847, 184716457, 184976961, 185145071, 187281445, 187872052, 188100653, 188875944, 188919873, 188920457, 189107250, 189203987, 189371817, 189414886, 189567458, 190266670, 191318187, 191337609, 202479203, 202493027, 202835587, 202843747, 203013219, 203036048, 203045987, 203177552, 203898516, 204648562, 205067918, 205078130, 205096654, 205689142, 205690439, 205766017, 205988909, 207213161, 207794484, 207800999, 208023602, 208213644, 208213647, 210261490, 210310273, 210940978, 213325049, 213946445, 214055079, 215125040, 215134273, 215135028, 215237420, 215418148, 215553166, 215553394, 215563858, 215627949, 215754324, 217529652, 217713834, 217732628, 218731945, 221417045, 221424946, 221493746, 221515401, 221658189, 221908140, 221910626, 221921586, 222659762, 225001091, 236105833, 236113965, 236194995, 236195427, 236206132, 236206387, 236211683, 236212707, 236381647, 236571826, 237124271, 238210544, 238270764, 238435405, 238501172, 239224867, 239257644, 239710497, 240307721, 241208789, 241241557, 241318060, 241319404, 241343533, 241344069, 241405397, 241765845, 243864964, 244502085, 244946220, 245109902, 247647266, 247707956, 248648814, 248648836, 248986932, 249058914, 249697357, 251841204, 252132601, 252135604, 252317348, 255007012, 255278388, 255641645, 256365156, 257566121, 269763372, 271202790, 271863856, 272049197, 272127474, 274339449, 274939471, 275388004, 275388005, 275388006, 275977800, 278267602, 278513831, 278712622, 281613765, 281683369, 282120228, 282250732, 282498697, 282508942, 283743649, 283787570, 284710386, 285391148, 285478533, 285854898, 285873762, 286931113, 288964227, 289445441, 289591340, 289689648, 291671489, 303512884, 305319975, 305610036, 305764101, 308448294, 308675890, 312085683, 312264750, 315032867, 316391000, 317331042, 317902135, 318950711, 319447220, 321499182, 322538804, 323145200, 337067316, 337826293, 339905989, 340833697, 341457068, 342310196, 345302593, 349554733, 349771471, 349786245, 350819405, 356072847, 370349192, 373962798, 375558638, 375574835, 376053993, 383276530, 383373833, 383407586, 384439906, 386079012, 404133513, 404307343, 407031852, 408072233, 409112005, 409608425, 409713793, 409771500, 419040932, 437730612, 439529766, 442616365, 442813037, 443157674, 443295316, 450118444, 450482697, 456789668, 459935396, 471217869, 474073645, 476230702, 476665218, 476717289, 483014825, 485083298, 489306281, 538364390, 540675748, 543819186, 543958612, 576960820, 577242548, 610515252, 642202932, 644420819 }; staticJArray nsHtml5ElementName::ELEMENT_HASHES = { ELEMENT_HASHES_DATA, MOZ_ARRAY_LENGTH(ELEMENT_HASHES_DATA) }; void nsHtml5ElementName::initializeStatics() @@ -819,7 +818,6 @@ nsHtml5ElementName::initializeStatics() ELT_LISTING = new nsHtml5ElementName(nsHtml5Atoms::listing, nsHtml5Atoms::listing, NS_HTML5TREE_BUILDER_PRE_OR_LISTING | NS_HTML5ELEMENT_NAME_SPECIAL); ELT_MFENCED = new nsHtml5ElementName(nsHtml5Atoms::mfenced, nsHtml5Atoms::mfenced, NS_HTML5TREE_BUILDER_OTHER); ELT_MPADDED = new nsHtml5ElementName(nsHtml5Atoms::mpadded, nsHtml5Atoms::mpadded, NS_HTML5TREE_BUILDER_OTHER); - ELT_MARQUEE = new nsHtml5ElementName(nsHtml5Atoms::marquee, nsHtml5Atoms::marquee, NS_HTML5TREE_BUILDER_MARQUEE_OR_APPLET | NS_HTML5ELEMENT_NAME_SPECIAL | NS_HTML5ELEMENT_NAME_SCOPING); ELT_MACTION = new nsHtml5ElementName(nsHtml5Atoms::maction, nsHtml5Atoms::maction, NS_HTML5TREE_BUILDER_OTHER); ELT_MSUBSUP = new nsHtml5ElementName(nsHtml5Atoms::msubsup, nsHtml5Atoms::msubsup, NS_HTML5TREE_BUILDER_OTHER); ELT_NOEMBED = new nsHtml5ElementName(nsHtml5Atoms::noembed, nsHtml5Atoms::noembed, NS_HTML5TREE_BUILDER_NOEMBED | NS_HTML5ELEMENT_NAME_SPECIAL); @@ -940,7 +938,7 @@ nsHtml5ElementName::initializeStatics() ELT_FESPECULARLIGHTING = new nsHtml5ElementName(nsHtml5Atoms::fespecularlighting, nsHtml5Atoms::feSpecularLighting, NS_HTML5TREE_BUILDER_OTHER); ELT_DOMAINOFAPPLICATION = new nsHtml5ElementName(nsHtml5Atoms::domainofapplication, nsHtml5Atoms::domainofapplication, NS_HTML5TREE_BUILDER_OTHER); ELT_FECOMPONENTTRANSFER = new nsHtml5ElementName(nsHtml5Atoms::fecomponenttransfer, nsHtml5Atoms::feComponentTransfer, NS_HTML5TREE_BUILDER_OTHER); - ELEMENT_NAMES = new nsHtml5ElementName*[398]; + ELEMENT_NAMES = new nsHtml5ElementName*[397]; ELEMENT_NAMES[0] = ELT_A; ELEMENT_NAMES[1] = ELT_B; ELEMENT_NAMES[2] = ELT_G; @@ -1218,127 +1216,126 @@ nsHtml5ElementName::initializeStatics() ELEMENT_NAMES[274] = ELT_LISTING; ELEMENT_NAMES[275] = ELT_MFENCED; ELEMENT_NAMES[276] = ELT_MPADDED; - ELEMENT_NAMES[277] = ELT_MARQUEE; - ELEMENT_NAMES[278] = ELT_MACTION; - ELEMENT_NAMES[279] = ELT_MSUBSUP; - ELEMENT_NAMES[280] = ELT_NOEMBED; - ELEMENT_NAMES[281] = ELT_PICTURE; - ELEMENT_NAMES[282] = ELT_POLYGON; - ELEMENT_NAMES[283] = ELT_PATTERN; - ELEMENT_NAMES[284] = ELT_PRODUCT; - ELEMENT_NAMES[285] = ELT_SETDIFF; - ELEMENT_NAMES[286] = ELT_SECTION; - ELEMENT_NAMES[287] = ELT_SUMMARY; - ELEMENT_NAMES[288] = ELT_TENDSTO; - ELEMENT_NAMES[289] = ELT_UPLIMIT; - ELEMENT_NAMES[290] = ELT_ALTGLYPH; - ELEMENT_NAMES[291] = ELT_BASEFONT; - ELEMENT_NAMES[292] = ELT_CLIPPATH; - ELEMENT_NAMES[293] = ELT_CODOMAIN; - ELEMENT_NAMES[294] = ELT_COLGROUP; - ELEMENT_NAMES[295] = ELT_EMPTYSET; - ELEMENT_NAMES[296] = ELT_FACTOROF; - ELEMENT_NAMES[297] = ELT_FIELDSET; - ELEMENT_NAMES[298] = ELT_FRAMESET; - ELEMENT_NAMES[299] = ELT_FEOFFSET; - ELEMENT_NAMES[300] = ELT_GLYPHREF; - ELEMENT_NAMES[301] = ELT_INTERVAL; - ELEMENT_NAMES[302] = ELT_INTEGERS; - ELEMENT_NAMES[303] = ELT_INFINITY; - ELEMENT_NAMES[304] = ELT_LISTENER; - ELEMENT_NAMES[305] = ELT_LOWLIMIT; - ELEMENT_NAMES[306] = ELT_METADATA; - ELEMENT_NAMES[307] = ELT_MENCLOSE; - ELEMENT_NAMES[308] = ELT_MENUITEM; - ELEMENT_NAMES[309] = ELT_MPHANTOM; - ELEMENT_NAMES[310] = ELT_NOFRAMES; - ELEMENT_NAMES[311] = ELT_NOSCRIPT; - ELEMENT_NAMES[312] = ELT_OPTGROUP; - ELEMENT_NAMES[313] = ELT_POLYLINE; - ELEMENT_NAMES[314] = ELT_PREFETCH; - ELEMENT_NAMES[315] = ELT_PROGRESS; - ELEMENT_NAMES[316] = ELT_PRSUBSET; - ELEMENT_NAMES[317] = ELT_QUOTIENT; - ELEMENT_NAMES[318] = ELT_SELECTOR; - ELEMENT_NAMES[319] = ELT_TEXTAREA; - ELEMENT_NAMES[320] = ELT_TEMPLATE; - ELEMENT_NAMES[321] = ELT_TEXTPATH; - ELEMENT_NAMES[322] = ELT_VARIANCE; - ELEMENT_NAMES[323] = ELT_ANIMATION; - ELEMENT_NAMES[324] = ELT_CONJUGATE; - ELEMENT_NAMES[325] = ELT_CONDITION; - ELEMENT_NAMES[326] = ELT_COMPLEXES; - ELEMENT_NAMES[327] = ELT_FONT_FACE; - ELEMENT_NAMES[328] = ELT_FACTORIAL; - ELEMENT_NAMES[329] = ELT_INTERSECT; - ELEMENT_NAMES[330] = ELT_IMAGINARY; - ELEMENT_NAMES[331] = ELT_LAPLACIAN; - ELEMENT_NAMES[332] = ELT_MATRIXROW; - ELEMENT_NAMES[333] = ELT_NOTSUBSET; - ELEMENT_NAMES[334] = ELT_OTHERWISE; - ELEMENT_NAMES[335] = ELT_PIECEWISE; - ELEMENT_NAMES[336] = ELT_PLAINTEXT; - ELEMENT_NAMES[337] = ELT_RATIONALS; - ELEMENT_NAMES[338] = ELT_SEMANTICS; - ELEMENT_NAMES[339] = ELT_TRANSPOSE; - ELEMENT_NAMES[340] = ELT_ANNOTATION; - ELEMENT_NAMES[341] = ELT_BLOCKQUOTE; - ELEMENT_NAMES[342] = ELT_DIVERGENCE; - ELEMENT_NAMES[343] = ELT_EULERGAMMA; - ELEMENT_NAMES[344] = ELT_EQUIVALENT; - ELEMENT_NAMES[345] = ELT_FIGCAPTION; - ELEMENT_NAMES[346] = ELT_IMAGINARYI; - ELEMENT_NAMES[347] = ELT_MALIGNMARK; - ELEMENT_NAMES[348] = ELT_MUNDEROVER; - ELEMENT_NAMES[349] = ELT_MLABELEDTR; - ELEMENT_NAMES[350] = ELT_NOTANUMBER; - ELEMENT_NAMES[351] = ELT_SOLIDCOLOR; - ELEMENT_NAMES[352] = ELT_ALTGLYPHDEF; - ELEMENT_NAMES[353] = ELT_DETERMINANT; - ELEMENT_NAMES[354] = ELT_FEMERGENODE; - ELEMENT_NAMES[355] = ELT_FECOMPOSITE; - ELEMENT_NAMES[356] = ELT_FESPOTLIGHT; - ELEMENT_NAMES[357] = ELT_MALIGNGROUP; - ELEMENT_NAMES[358] = ELT_MPRESCRIPTS; - ELEMENT_NAMES[359] = ELT_MOMENTABOUT; - ELEMENT_NAMES[360] = ELT_NOTPRSUBSET; - ELEMENT_NAMES[361] = ELT_PARTIALDIFF; - ELEMENT_NAMES[362] = ELT_ALTGLYPHITEM; - ELEMENT_NAMES[363] = ELT_ANIMATECOLOR; - ELEMENT_NAMES[364] = ELT_DATATEMPLATE; - ELEMENT_NAMES[365] = ELT_EXPONENTIALE; - ELEMENT_NAMES[366] = ELT_FETURBULENCE; - ELEMENT_NAMES[367] = ELT_FEPOINTLIGHT; - ELEMENT_NAMES[368] = ELT_FEDROPSHADOW; - ELEMENT_NAMES[369] = ELT_FEMORPHOLOGY; - ELEMENT_NAMES[370] = ELT_OUTERPRODUCT; - ELEMENT_NAMES[371] = ELT_ANIMATEMOTION; - ELEMENT_NAMES[372] = ELT_COLOR_PROFILE; - ELEMENT_NAMES[373] = ELT_FONT_FACE_SRC; - ELEMENT_NAMES[374] = ELT_FONT_FACE_URI; - ELEMENT_NAMES[375] = ELT_FOREIGNOBJECT; - ELEMENT_NAMES[376] = ELT_FECOLORMATRIX; - ELEMENT_NAMES[377] = ELT_MISSING_GLYPH; - ELEMENT_NAMES[378] = ELT_MMULTISCRIPTS; - ELEMENT_NAMES[379] = ELT_SCALARPRODUCT; - ELEMENT_NAMES[380] = ELT_VECTORPRODUCT; - ELEMENT_NAMES[381] = ELT_ANNOTATION_XML; - ELEMENT_NAMES[382] = ELT_DEFINITION_SRC; - ELEMENT_NAMES[383] = ELT_FONT_FACE_NAME; - ELEMENT_NAMES[384] = ELT_FEGAUSSIANBLUR; - ELEMENT_NAMES[385] = ELT_FEDISTANTLIGHT; - ELEMENT_NAMES[386] = ELT_LINEARGRADIENT; - ELEMENT_NAMES[387] = ELT_NATURALNUMBERS; - ELEMENT_NAMES[388] = ELT_RADIALGRADIENT; - ELEMENT_NAMES[389] = ELT_ANIMATETRANSFORM; - ELEMENT_NAMES[390] = ELT_CARTESIANPRODUCT; - ELEMENT_NAMES[391] = ELT_FONT_FACE_FORMAT; - ELEMENT_NAMES[392] = ELT_FECONVOLVEMATRIX; - ELEMENT_NAMES[393] = ELT_FEDIFFUSELIGHTING; - ELEMENT_NAMES[394] = ELT_FEDISPLACEMENTMAP; - ELEMENT_NAMES[395] = ELT_FESPECULARLIGHTING; - ELEMENT_NAMES[396] = ELT_DOMAINOFAPPLICATION; - ELEMENT_NAMES[397] = ELT_FECOMPONENTTRANSFER; + ELEMENT_NAMES[277] = ELT_MACTION; + ELEMENT_NAMES[278] = ELT_MSUBSUP; + ELEMENT_NAMES[279] = ELT_NOEMBED; + ELEMENT_NAMES[280] = ELT_PICTURE; + ELEMENT_NAMES[281] = ELT_POLYGON; + ELEMENT_NAMES[282] = ELT_PATTERN; + ELEMENT_NAMES[283] = ELT_PRODUCT; + ELEMENT_NAMES[284] = ELT_SETDIFF; + ELEMENT_NAMES[285] = ELT_SECTION; + ELEMENT_NAMES[286] = ELT_SUMMARY; + ELEMENT_NAMES[287] = ELT_TENDSTO; + ELEMENT_NAMES[288] = ELT_UPLIMIT; + ELEMENT_NAMES[289] = ELT_ALTGLYPH; + ELEMENT_NAMES[290] = ELT_BASEFONT; + ELEMENT_NAMES[291] = ELT_CLIPPATH; + ELEMENT_NAMES[292] = ELT_CODOMAIN; + ELEMENT_NAMES[293] = ELT_COLGROUP; + ELEMENT_NAMES[294] = ELT_EMPTYSET; + ELEMENT_NAMES[295] = ELT_FACTOROF; + ELEMENT_NAMES[296] = ELT_FIELDSET; + ELEMENT_NAMES[297] = ELT_FRAMESET; + ELEMENT_NAMES[298] = ELT_FEOFFSET; + ELEMENT_NAMES[299] = ELT_GLYPHREF; + ELEMENT_NAMES[300] = ELT_INTERVAL; + ELEMENT_NAMES[301] = ELT_INTEGERS; + ELEMENT_NAMES[302] = ELT_INFINITY; + ELEMENT_NAMES[303] = ELT_LISTENER; + ELEMENT_NAMES[304] = ELT_LOWLIMIT; + ELEMENT_NAMES[305] = ELT_METADATA; + ELEMENT_NAMES[306] = ELT_MENCLOSE; + ELEMENT_NAMES[307] = ELT_MENUITEM; + ELEMENT_NAMES[308] = ELT_MPHANTOM; + ELEMENT_NAMES[309] = ELT_NOFRAMES; + ELEMENT_NAMES[310] = ELT_NOSCRIPT; + ELEMENT_NAMES[311] = ELT_OPTGROUP; + ELEMENT_NAMES[312] = ELT_POLYLINE; + ELEMENT_NAMES[313] = ELT_PREFETCH; + ELEMENT_NAMES[314] = ELT_PROGRESS; + ELEMENT_NAMES[315] = ELT_PRSUBSET; + ELEMENT_NAMES[316] = ELT_QUOTIENT; + ELEMENT_NAMES[317] = ELT_SELECTOR; + ELEMENT_NAMES[318] = ELT_TEXTAREA; + ELEMENT_NAMES[319] = ELT_TEMPLATE; + ELEMENT_NAMES[320] = ELT_TEXTPATH; + ELEMENT_NAMES[321] = ELT_VARIANCE; + ELEMENT_NAMES[322] = ELT_ANIMATION; + ELEMENT_NAMES[323] = ELT_CONJUGATE; + ELEMENT_NAMES[324] = ELT_CONDITION; + ELEMENT_NAMES[325] = ELT_COMPLEXES; + ELEMENT_NAMES[326] = ELT_FONT_FACE; + ELEMENT_NAMES[327] = ELT_FACTORIAL; + ELEMENT_NAMES[328] = ELT_INTERSECT; + ELEMENT_NAMES[329] = ELT_IMAGINARY; + ELEMENT_NAMES[330] = ELT_LAPLACIAN; + ELEMENT_NAMES[331] = ELT_MATRIXROW; + ELEMENT_NAMES[332] = ELT_NOTSUBSET; + ELEMENT_NAMES[333] = ELT_OTHERWISE; + ELEMENT_NAMES[334] = ELT_PIECEWISE; + ELEMENT_NAMES[335] = ELT_PLAINTEXT; + ELEMENT_NAMES[336] = ELT_RATIONALS; + ELEMENT_NAMES[337] = ELT_SEMANTICS; + ELEMENT_NAMES[338] = ELT_TRANSPOSE; + ELEMENT_NAMES[339] = ELT_ANNOTATION; + ELEMENT_NAMES[340] = ELT_BLOCKQUOTE; + ELEMENT_NAMES[341] = ELT_DIVERGENCE; + ELEMENT_NAMES[342] = ELT_EULERGAMMA; + ELEMENT_NAMES[343] = ELT_EQUIVALENT; + ELEMENT_NAMES[344] = ELT_FIGCAPTION; + ELEMENT_NAMES[345] = ELT_IMAGINARYI; + ELEMENT_NAMES[346] = ELT_MALIGNMARK; + ELEMENT_NAMES[347] = ELT_MUNDEROVER; + ELEMENT_NAMES[348] = ELT_MLABELEDTR; + ELEMENT_NAMES[349] = ELT_NOTANUMBER; + ELEMENT_NAMES[350] = ELT_SOLIDCOLOR; + ELEMENT_NAMES[351] = ELT_ALTGLYPHDEF; + ELEMENT_NAMES[352] = ELT_DETERMINANT; + ELEMENT_NAMES[353] = ELT_FEMERGENODE; + ELEMENT_NAMES[354] = ELT_FECOMPOSITE; + ELEMENT_NAMES[355] = ELT_FESPOTLIGHT; + ELEMENT_NAMES[356] = ELT_MALIGNGROUP; + ELEMENT_NAMES[357] = ELT_MPRESCRIPTS; + ELEMENT_NAMES[358] = ELT_MOMENTABOUT; + ELEMENT_NAMES[359] = ELT_NOTPRSUBSET; + ELEMENT_NAMES[360] = ELT_PARTIALDIFF; + ELEMENT_NAMES[361] = ELT_ALTGLYPHITEM; + ELEMENT_NAMES[362] = ELT_ANIMATECOLOR; + ELEMENT_NAMES[363] = ELT_DATATEMPLATE; + ELEMENT_NAMES[364] = ELT_EXPONENTIALE; + ELEMENT_NAMES[365] = ELT_FETURBULENCE; + ELEMENT_NAMES[366] = ELT_FEPOINTLIGHT; + ELEMENT_NAMES[367] = ELT_FEDROPSHADOW; + ELEMENT_NAMES[368] = ELT_FEMORPHOLOGY; + ELEMENT_NAMES[369] = ELT_OUTERPRODUCT; + ELEMENT_NAMES[370] = ELT_ANIMATEMOTION; + ELEMENT_NAMES[371] = ELT_COLOR_PROFILE; + ELEMENT_NAMES[372] = ELT_FONT_FACE_SRC; + ELEMENT_NAMES[373] = ELT_FONT_FACE_URI; + ELEMENT_NAMES[374] = ELT_FOREIGNOBJECT; + ELEMENT_NAMES[375] = ELT_FECOLORMATRIX; + ELEMENT_NAMES[376] = ELT_MISSING_GLYPH; + ELEMENT_NAMES[377] = ELT_MMULTISCRIPTS; + ELEMENT_NAMES[378] = ELT_SCALARPRODUCT; + ELEMENT_NAMES[379] = ELT_VECTORPRODUCT; + ELEMENT_NAMES[380] = ELT_ANNOTATION_XML; + ELEMENT_NAMES[381] = ELT_DEFINITION_SRC; + ELEMENT_NAMES[382] = ELT_FONT_FACE_NAME; + ELEMENT_NAMES[383] = ELT_FEGAUSSIANBLUR; + ELEMENT_NAMES[384] = ELT_FEDISTANTLIGHT; + ELEMENT_NAMES[385] = ELT_LINEARGRADIENT; + ELEMENT_NAMES[386] = ELT_NATURALNUMBERS; + ELEMENT_NAMES[387] = ELT_RADIALGRADIENT; + ELEMENT_NAMES[388] = ELT_ANIMATETRANSFORM; + ELEMENT_NAMES[389] = ELT_CARTESIANPRODUCT; + ELEMENT_NAMES[390] = ELT_FONT_FACE_FORMAT; + ELEMENT_NAMES[391] = ELT_FECONVOLVEMATRIX; + ELEMENT_NAMES[392] = ELT_FEDIFFUSELIGHTING; + ELEMENT_NAMES[393] = ELT_FEDISPLACEMENTMAP; + ELEMENT_NAMES[394] = ELT_FESPECULARLIGHTING; + ELEMENT_NAMES[395] = ELT_DOMAINOFAPPLICATION; + ELEMENT_NAMES[396] = ELT_FECOMPONENTTRANSFER; } void @@ -1622,7 +1619,6 @@ nsHtml5ElementName::releaseStatics() delete ELT_LISTING; delete ELT_MFENCED; delete ELT_MPADDED; - delete ELT_MARQUEE; delete ELT_MACTION; delete ELT_MSUBSUP; delete ELT_NOEMBED; -- cgit v1.2.3 From 9c515323ff6cc0dc42b9ee64397f297b7566d0a4 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 30 Aug 2020 22:10:17 -0400 Subject: Issue #618 - Don't preload nomodule scripts when modules are enabled (uplift) --- .../src/nu/validator/htmlparser/impl/AttributeName.java | 2 ++ parser/html/nsHtml5SpeculativeLoad.cpp | 16 +++++++++++++--- parser/html/nsHtml5SpeculativeLoad.h | 17 +++++++++++++---- parser/html/nsHtml5TreeBuilderCppSupplement.h | 8 ++++++-- parser/html/nsHtml5TreeOpExecutor.cpp | 6 ++++-- parser/html/nsHtml5TreeOpExecutor.h | 3 ++- 6 files changed, 40 insertions(+), 12 deletions(-) (limited to 'parser') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java index 48d82036c..21364617a 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java @@ -1072,6 +1072,7 @@ public final class AttributeName public static final AttributeName ONFOCUSOUT = new AttributeName(ALL_NO_NS, SAME_LOCAL("onfocusout"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName ONMOUSEOUT = new AttributeName(ALL_NO_NS, SAME_LOCAL("onmouseout"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName NUMOCTAVES = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("numoctaves", "numOctaves"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); + public static final AttributeName NOMODULE = new AttributeName(ALL_NO_NS, SAME_LOCAL("nomodule"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG | CASE_FOLDED | BOOLEAN); public static final AttributeName MARKER_MID = new AttributeName(ALL_NO_NS, SAME_LOCAL("marker-mid"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName MARKER_END = new AttributeName(ALL_NO_NS, SAME_LOCAL("marker-end"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName TEXTLENGTH = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("textlength", "textLength"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); @@ -1737,6 +1738,7 @@ public final class AttributeName ONMOUSELEAVE, ONFORMCHANGE, ONCELLCHANGE, + NOMODULE, ONMOUSEWHEEL, ONMOUSEENTER, ONAFTERPRINT, diff --git a/parser/html/nsHtml5SpeculativeLoad.cpp b/parser/html/nsHtml5SpeculativeLoad.cpp index 7bae0699f..35c11b739 100644 --- a/parser/html/nsHtml5SpeculativeLoad.cpp +++ b/parser/html/nsHtml5SpeculativeLoad.cpp @@ -52,17 +52,27 @@ nsHtml5SpeculativeLoad::Perform(nsHtml5TreeOpExecutor* aExecutor) case eSpeculativeLoadScript: aExecutor->PreloadScript(mUrl, mCharset, mTypeOrCharsetSourceOrDocumentMode, mCrossOrigin, mIntegrity, false, - mIsAsync, mIsDefer); + mIsAsync, mIsDefer, false); break; case eSpeculativeLoadScriptFromHead: aExecutor->PreloadScript(mUrl, mCharset, mTypeOrCharsetSourceOrDocumentMode, mCrossOrigin, mIntegrity, true, - mIsAsync, mIsDefer); + mIsAsync, mIsDefer, false); + break; + case eSpeculativeLoadNoModuleScript: + aExecutor->PreloadScript(mUrl, mCharset, mTypeOrCharsetSourceOrDocumentMode, + mCrossOrigin, mIntegrity, false, + mIsAsync, mIsDefer, true); + break; + case eSpeculativeLoadNoModuleScriptFromHead: + aExecutor->PreloadScript(mUrl, mCharset, mTypeOrCharsetSourceOrDocumentMode, + mCrossOrigin, mIntegrity, true, + mIsAsync, mIsDefer, true); break; case eSpeculativeLoadStyle: aExecutor->PreloadStyle(mUrl, mCharset, mCrossOrigin, mIntegrity); break; - case eSpeculativeLoadManifest: + case eSpeculativeLoadManifest: aExecutor->ProcessOfflineManifest(mUrl); break; case eSpeculativeLoadSetDocumentCharset: { diff --git a/parser/html/nsHtml5SpeculativeLoad.h b/parser/html/nsHtml5SpeculativeLoad.h index fcc84de4f..1f4a61741 100644 --- a/parser/html/nsHtml5SpeculativeLoad.h +++ b/parser/html/nsHtml5SpeculativeLoad.h @@ -10,7 +10,8 @@ class nsHtml5TreeOpExecutor; -enum eHtml5SpeculativeLoad { +enum eHtml5SpeculativeLoad +{ #ifdef DEBUG eSpeculativeLoadUninitialized, #endif @@ -23,6 +24,8 @@ enum eHtml5SpeculativeLoad { eSpeculativeLoadPictureSource, eSpeculativeLoadScript, eSpeculativeLoadScriptFromHead, + eSpeculativeLoadNoModuleScript, + eSpeculativeLoadNoModuleScriptFromHead, eSpeculativeLoadStyle, eSpeculativeLoadManifest, eSpeculativeLoadSetDocumentCharset, @@ -130,12 +133,18 @@ class nsHtml5SpeculativeLoad { nsHtml5String aIntegrity, bool aParserInHead, bool aAsync, - bool aDefer) + bool aDefer, + bool aNoModule) { NS_PRECONDITION(mOpCode == eSpeculativeLoadUninitialized, "Trying to reinitialize a speculative load!"); - mOpCode = aParserInHead ? - eSpeculativeLoadScriptFromHead : eSpeculativeLoadScript; + if (aNoModule) { + mOpCode = aParserInHead ? eSpeculativeLoadNoModuleScriptFromHead + : eSpeculativeLoadNoModuleScript; + } else { + mOpCode = aParserInHead ? eSpeculativeLoadScriptFromHead + : eSpeculativeLoadScript; + } aUrl.ToString(mUrl); aCharset.ToString(mCharset); aType.ToString(mTypeOrCharsetSourceOrDocumentMode); diff --git a/parser/html/nsHtml5TreeBuilderCppSupplement.h b/parser/html/nsHtml5TreeBuilderCppSupplement.h index 9709396c7..f0326a20a 100644 --- a/parser/html/nsHtml5TreeBuilderCppSupplement.h +++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h @@ -171,6 +171,8 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName, aAttributes->contains(nsHtml5AttributeName::ATTR_ASYNC); bool defer = aAttributes->contains(nsHtml5AttributeName::ATTR_DEFER); + bool noModule = + aAttributes->contains(nsHtml5AttributeName::ATTR_NOMODULE); mSpeculativeLoadQueue.AppendElement()->InitScript( url, charset, @@ -179,7 +181,8 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName, integrity, mode == NS_HTML5TREE_BUILDER_IN_HEAD, async, - defer); + defer, + noModule); mCurrentHtmlScriptIsAsyncOrDefer = async || defer; } } else if (nsHtml5Atoms::link == aName) { @@ -285,7 +288,8 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName, integrity, mode == NS_HTML5TREE_BUILDER_IN_HEAD, false /* async */, - false /* defer */); + false /* defer */, + false /* noModule */); } } else if (nsHtml5Atoms::style == aName) { nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement(); diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 9be7f3b0d..cd5c68913 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -923,14 +923,16 @@ nsHtml5TreeOpExecutor::PreloadScript(const nsAString& aURL, const nsAString& aIntegrity, bool aScriptFromHead, bool aAsync, - bool aDefer) + bool aDefer, + bool aNoModule) { nsCOMPtr uri = ConvertIfNotPreloadedYet(aURL); if (!uri) { return; } mDocument->ScriptLoader()->PreloadURI(uri, aCharset, aType, aCrossOrigin, - aIntegrity, aScriptFromHead, aAsync, aDefer, + aIntegrity, aScriptFromHead, aAsync, + aDefer, aNoModule, mSpeculationReferrerPolicy); } diff --git a/parser/html/nsHtml5TreeOpExecutor.h b/parser/html/nsHtml5TreeOpExecutor.h index 64a5daa96..878f359c5 100644 --- a/parser/html/nsHtml5TreeOpExecutor.h +++ b/parser/html/nsHtml5TreeOpExecutor.h @@ -251,7 +251,8 @@ class nsHtml5TreeOpExecutor final : public nsHtml5DocumentBuilder, const nsAString& aIntegrity, bool aScriptFromHead, bool aAsync, - bool aDefer); + bool aDefer, + bool aNoModule); void PreloadStyle(const nsAString& aURL, const nsAString& aCharset, const nsAString& aCrossOrigin, -- cgit v1.2.3 From 427d325d0c7013531f2cb047eb2170e78fd264eb Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 30 Aug 2020 22:20:22 -0400 Subject: Regenerate the HTML Parser code for nomodule changes. --- .../validator/htmlparser/impl/AttributeName.java | 5 +- parser/html/nsHtml5AtomList.h | 1 + parser/html/nsHtml5AttributeName.cpp | 652 +++++++++++---------- parser/html/nsHtml5AttributeName.h | 1 + 4 files changed, 333 insertions(+), 326 deletions(-) (limited to 'parser') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java index 21364617a..c349c82a5 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java @@ -980,6 +980,7 @@ public final class AttributeName public static final AttributeName ONREPEAT = new AttributeName(ALL_NO_NS, SAME_LOCAL("onrepeat"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName ONSELECT = new AttributeName(ALL_NO_NS, SAME_LOCAL("onselect"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName NOTATION = new AttributeName(ALL_NO_NS, SAME_LOCAL("notation"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); + public static final AttributeName NOMODULE = new AttributeName(ALL_NO_NS, SAME_LOCAL("nomodule"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG | CASE_FOLDED | BOOLEAN); public static final AttributeName NORESIZE = new AttributeName(ALL_NO_NS, SAME_LOCAL("noresize"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG | CASE_FOLDED | BOOLEAN); public static final AttributeName MANIFEST = new AttributeName(ALL_NO_NS, SAME_LOCAL("manifest"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName MATHSIZE = new AttributeName(ALL_NO_NS, SAME_LOCAL("mathsize"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); @@ -1072,7 +1073,6 @@ public final class AttributeName public static final AttributeName ONFOCUSOUT = new AttributeName(ALL_NO_NS, SAME_LOCAL("onfocusout"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName ONMOUSEOUT = new AttributeName(ALL_NO_NS, SAME_LOCAL("onmouseout"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName NUMOCTAVES = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("numoctaves", "numOctaves"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); - public static final AttributeName NOMODULE = new AttributeName(ALL_NO_NS, SAME_LOCAL("nomodule"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG | CASE_FOLDED | BOOLEAN); public static final AttributeName MARKER_MID = new AttributeName(ALL_NO_NS, SAME_LOCAL("marker-mid"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName MARKER_END = new AttributeName(ALL_NO_NS, SAME_LOCAL("marker-end"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); public static final AttributeName TEXTLENGTH = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("textlength", "textLength"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG); @@ -1565,6 +1565,7 @@ public final class AttributeName ONREPEAT, ONSELECT, NOTATION, + NOMODULE, NORESIZE, MANIFEST, MATHSIZE, @@ -1738,7 +1739,6 @@ public final class AttributeName ONMOUSELEAVE, ONFORMCHANGE, ONCELLCHANGE, - NOMODULE, ONMOUSEWHEEL, ONMOUSEENTER, ONAFTERPRINT, @@ -2151,6 +2151,7 @@ public final class AttributeName 280686710, 280689066, 282736758, + 283095348, 283110901, 283275116, 283823226, diff --git a/parser/html/nsHtml5AtomList.h b/parser/html/nsHtml5AtomList.h index 26ceff4b1..3341a13e7 100644 --- a/parser/html/nsHtml5AtomList.h +++ b/parser/html/nsHtml5AtomList.h @@ -338,6 +338,7 @@ HTML5_ATOM(onsubmit, "onsubmit") HTML5_ATOM(onrepeat, "onrepeat") HTML5_ATOM(onselect, "onselect") HTML5_ATOM(notation, "notation") +HTML5_ATOM(nomodule, "nomodule") HTML5_ATOM(noresize, "noresize") HTML5_ATOM(manifest, "manifest") HTML5_ATOM(mathsize, "mathsize") diff --git a/parser/html/nsHtml5AttributeName.cpp b/parser/html/nsHtml5AttributeName.cpp index 7e1cb7dd0..4cd0ce5e2 100644 --- a/parser/html/nsHtml5AttributeName.cpp +++ b/parser/html/nsHtml5AttributeName.cpp @@ -458,6 +458,7 @@ nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONSUBMIT = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONREPEAT = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONSELECT = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_NOTATION = nullptr; +nsHtml5AttributeName* nsHtml5AttributeName::ATTR_NOMODULE = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_NORESIZE = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_MANIFEST = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_MATHSIZE = nullptr; @@ -781,7 +782,7 @@ nsHtml5AttributeName* nsHtml5AttributeName::ATTR_GLYPH_ORIENTATION_VERTICAL = nu nsHtml5AttributeName* nsHtml5AttributeName::ATTR_COLOR_INTERPOLATION_FILTERS = nullptr; nsHtml5AttributeName* nsHtml5AttributeName::ATTR_GLYPH_ORIENTATION_HORIZONTAL = nullptr; nsHtml5AttributeName** nsHtml5AttributeName::ATTRIBUTE_NAMES = 0; -static int32_t const ATTRIBUTE_HASHES_DATA[] = { 1153, 1383, 1601, 1793, 1827, 1857, 68600, 69146, 69177, 70237, 70270, 71572, 71669, 72415, 72444, 74846, 74904, 74943, 75001, 75276, 75590, 84742, 84839, 85575, 85963, 85992, 87204, 88074, 88171, 89130, 89163, 3207892, 3283895, 3284791, 3338752, 3358197, 3369562, 3539124, 3562402, 3574260, 3670335, 3696933, 3721879, 135280021, 135346322, 136317019, 136475749, 136548517, 136652214, 136884919, 136902418, 136942992, 137292068, 139120259, 139785574, 142250603, 142314056, 142331176, 142519584, 144752417, 145106895, 146147200, 146765926, 148805544, 149655723, 149809441, 150018784, 150445028, 150813181, 150923321, 152528754, 152536216, 152647366, 152962785, 155219321, 155654904, 157317483, 157350248, 157437941, 157447478, 157604838, 157685404, 157894402, 158315188, 166078431, 169409980, 169700259, 169856932, 170007032, 170409695, 170466488, 170513710, 170608367, 173028944, 173896963, 176090625, 176129212, 179390001, 179489057, 179627464, 179840468, 179849042, 180004216, 181779081, 183027151, 183645319, 183698797, 185922012, 185997252, 188312483, 188675799, 190977533, 190992569, 191006194, 191033518, 191038774, 191096249, 191166163, 191194426, 191443343, 191522106, 191568039, 200104642, 202506661, 202537381, 202602917, 203070590, 203120766, 203389054, 203690071, 203971238, 203986524, 209040857, 209125756, 212055489, 212322418, 212746849, 213002877, 213055164, 213088023, 213259873, 213273386, 213435118, 213437318, 213438231, 213493071, 213532268, 213542834, 213584431, 213659891, 215285828, 215880731, 216112976, 216684637, 217369699, 217565298, 217576549, 218186795, 219743185, 220082234, 221623802, 221986406, 222283890, 223089542, 223138630, 223311265, 224431494, 224547358, 224587256, 224589550, 224655650, 224785518, 224810917, 224813302, 225126263, 225429618, 225432950, 225440869, 236107233, 236709921, 236838947, 237117095, 237143271, 237172455, 237209953, 237354143, 237372743, 237668065, 237703073, 237714273, 239743521, 240512803, 240522627, 240560417, 240656513, 241015715, 241062755, 241065383, 243523041, 245865199, 246261793, 246556195, 246774817, 246923491, 246928419, 246981667, 247014847, 247058369, 247112833, 247118177, 247119137, 247128739, 247316903, 249533729, 250235623, 250269543, 251402351, 252339047, 253260911, 253293679, 254844367, 255547879, 256077281, 256345377, 258124199, 258354465, 258605063, 258744193, 258845603, 258856961, 258926689, 269869248, 270174334, 270709417, 270778994, 270781796, 271102503, 271478858, 271490090, 272870654, 273335275, 273369140, 273924313, 274108530, 274116736, 276818662, 277476156, 279156579, 279349675, 280108533, 280128712, 280132869, 280162403, 280280292, 280413430, 280506130, 280677397, 280678580, 280686710, 280689066, 282736758, 283110901, 283275116, 283823226, 283890012, 284479340, 284606461, 286700477, 286798916, 290055764, 291557706, 291665349, 291804100, 292138018, 292166446, 292418738, 292451039, 300298041, 300374839, 300597935, 303073389, 303083839, 303266673, 303354997, 303430688, 303576261, 303724281, 303819694, 304242723, 304382625, 306247792, 307227811, 307468786, 307724489, 310252031, 310358241, 310373094, 310833159, 311015256, 313357609, 313683893, 313701861, 313706996, 313707317, 313710350, 313795700, 314027746, 314038181, 314091299, 314205627, 314233813, 316741830, 316797986, 317486755, 317794164, 320076137, 322657125, 322887778, 323506876, 323572412, 323605180, 325060058, 325320188, 325398738, 325541490, 325671619, 333868843, 336806130, 337212108, 337282686, 337285434, 337585223, 338036037, 338298087, 338566051, 340943551, 341190970, 342995704, 343352124, 343912673, 344585053, 346977248, 347218098, 347262163, 347278576, 347438191, 347655959, 347684788, 347726430, 347727772, 347776035, 347776629, 349500753, 350880161, 350887073, 353384123, 355496998, 355906922, 355979793, 356545959, 358637867, 358905016, 359164318, 359247286, 359350571, 359579447, 365560330, 367399355, 367420285, 367510727, 368013212, 370234760, 370353345, 370710317, 371074566, 371122285, 371194213, 371448425, 371448430, 371545055, 371593469, 371596922, 371758751, 371964792, 372151328, 376550136, 376710172, 376795771, 376826271, 376906556, 380514830, 380774774, 380775037, 381030322, 381136500, 381281631, 381282269, 381285504, 381330595, 381331422, 381335911, 381336484, 383907298, 383917408, 384595009, 384595013, 387799894, 387823201, 392581647, 392584937, 392742684, 392906485, 393003349, 400644707, 400973830, 404428547, 404432113, 404432865, 404469244, 404478897, 404694860, 406887479, 408294949, 408789955, 410022510, 410467324, 410586448, 410945965, 411845275, 414327152, 414327932, 414329781, 414346257, 414346439, 414639928, 414835998, 414894517, 414986533, 417465377, 417465381, 417492216, 418259232, 419310946, 420103495, 420242342, 420380455, 420658662, 420717432, 423183880, 424539259, 425929170, 425972964, 426050649, 426126450, 426142833, 426607922, 437289840, 437347469, 437412335, 437423943, 437455540, 437462252, 437597991, 437617485, 437986305, 437986507, 437986828, 437987072, 438015591, 438034813, 438038966, 438179623, 438347971, 438483573, 438547062, 438895551, 441592676, 442032555, 443548979, 447881379, 447881655, 447881895, 447887844, 448416189, 448445746, 448449012, 450942191, 452816744, 453668677, 454434495, 456610076, 456642844, 456738709, 457544600, 459451897, 459680944, 468058810, 468083581, 470964084, 471470955, 471567278, 472267822, 481177859, 481210627, 481435874, 481455115, 481485378, 481490218, 485105638, 486005878, 486383494, 487988916, 488103783, 490661867, 491574090, 491578272, 492891370, 493041952, 493441205, 493582844, 493716979, 504577572, 504740359, 505091638, 505592418, 505656212, 509516275, 514998531, 515571132, 515594682, 518712698, 521362273, 526592419, 526807354, 527348842, 538294791, 544689535, 545535009, 548544752, 548563346, 548595116, 551679010, 558034099, 560329411, 560356209, 560671018, 560671152, 560692590, 560845442, 569212097, 569474241, 572252718, 575326764, 576174758, 576190819, 582099184, 582099438, 582372519, 582558889, 586552164, 591325418, 594231990, 594243961, 605711268, 615672071, 616086845, 621792370, 624879850, 627432831, 640040548, 654392808, 658675477, 659420283, 672891587, 694768102, 705890982, 725543146, 759097578, 761686526, 795383908, 878105336, 908643300, 945213471 }; +static int32_t const ATTRIBUTE_HASHES_DATA[] = { 1153, 1383, 1601, 1793, 1827, 1857, 68600, 69146, 69177, 70237, 70270, 71572, 71669, 72415, 72444, 74846, 74904, 74943, 75001, 75276, 75590, 84742, 84839, 85575, 85963, 85992, 87204, 88074, 88171, 89130, 89163, 3207892, 3283895, 3284791, 3338752, 3358197, 3369562, 3539124, 3562402, 3574260, 3670335, 3696933, 3721879, 135280021, 135346322, 136317019, 136475749, 136548517, 136652214, 136884919, 136902418, 136942992, 137292068, 139120259, 139785574, 142250603, 142314056, 142331176, 142519584, 144752417, 145106895, 146147200, 146765926, 148805544, 149655723, 149809441, 150018784, 150445028, 150813181, 150923321, 152528754, 152536216, 152647366, 152962785, 155219321, 155654904, 157317483, 157350248, 157437941, 157447478, 157604838, 157685404, 157894402, 158315188, 166078431, 169409980, 169700259, 169856932, 170007032, 170409695, 170466488, 170513710, 170608367, 173028944, 173896963, 176090625, 176129212, 179390001, 179489057, 179627464, 179840468, 179849042, 180004216, 181779081, 183027151, 183645319, 183698797, 185922012, 185997252, 188312483, 188675799, 190977533, 190992569, 191006194, 191033518, 191038774, 191096249, 191166163, 191194426, 191443343, 191522106, 191568039, 200104642, 202506661, 202537381, 202602917, 203070590, 203120766, 203389054, 203690071, 203971238, 203986524, 209040857, 209125756, 212055489, 212322418, 212746849, 213002877, 213055164, 213088023, 213259873, 213273386, 213435118, 213437318, 213438231, 213493071, 213532268, 213542834, 213584431, 213659891, 215285828, 215880731, 216112976, 216684637, 217369699, 217565298, 217576549, 218186795, 219743185, 220082234, 221623802, 221986406, 222283890, 223089542, 223138630, 223311265, 224431494, 224547358, 224587256, 224589550, 224655650, 224785518, 224810917, 224813302, 225126263, 225429618, 225432950, 225440869, 236107233, 236709921, 236838947, 237117095, 237143271, 237172455, 237209953, 237354143, 237372743, 237668065, 237703073, 237714273, 239743521, 240512803, 240522627, 240560417, 240656513, 241015715, 241062755, 241065383, 243523041, 245865199, 246261793, 246556195, 246774817, 246923491, 246928419, 246981667, 247014847, 247058369, 247112833, 247118177, 247119137, 247128739, 247316903, 249533729, 250235623, 250269543, 251402351, 252339047, 253260911, 253293679, 254844367, 255547879, 256077281, 256345377, 258124199, 258354465, 258605063, 258744193, 258845603, 258856961, 258926689, 269869248, 270174334, 270709417, 270778994, 270781796, 271102503, 271478858, 271490090, 272870654, 273335275, 273369140, 273924313, 274108530, 274116736, 276818662, 277476156, 279156579, 279349675, 280108533, 280128712, 280132869, 280162403, 280280292, 280413430, 280506130, 280677397, 280678580, 280686710, 280689066, 282736758, 283095348, 283110901, 283275116, 283823226, 283890012, 284479340, 284606461, 286700477, 286798916, 290055764, 291557706, 291665349, 291804100, 292138018, 292166446, 292418738, 292451039, 300298041, 300374839, 300597935, 303073389, 303083839, 303266673, 303354997, 303430688, 303576261, 303724281, 303819694, 304242723, 304382625, 306247792, 307227811, 307468786, 307724489, 310252031, 310358241, 310373094, 310833159, 311015256, 313357609, 313683893, 313701861, 313706996, 313707317, 313710350, 313795700, 314027746, 314038181, 314091299, 314205627, 314233813, 316741830, 316797986, 317486755, 317794164, 320076137, 322657125, 322887778, 323506876, 323572412, 323605180, 325060058, 325320188, 325398738, 325541490, 325671619, 333868843, 336806130, 337212108, 337282686, 337285434, 337585223, 338036037, 338298087, 338566051, 340943551, 341190970, 342995704, 343352124, 343912673, 344585053, 346977248, 347218098, 347262163, 347278576, 347438191, 347655959, 347684788, 347726430, 347727772, 347776035, 347776629, 349500753, 350880161, 350887073, 353384123, 355496998, 355906922, 355979793, 356545959, 358637867, 358905016, 359164318, 359247286, 359350571, 359579447, 365560330, 367399355, 367420285, 367510727, 368013212, 370234760, 370353345, 370710317, 371074566, 371122285, 371194213, 371448425, 371448430, 371545055, 371593469, 371596922, 371758751, 371964792, 372151328, 376550136, 376710172, 376795771, 376826271, 376906556, 380514830, 380774774, 380775037, 381030322, 381136500, 381281631, 381282269, 381285504, 381330595, 381331422, 381335911, 381336484, 383907298, 383917408, 384595009, 384595013, 387799894, 387823201, 392581647, 392584937, 392742684, 392906485, 393003349, 400644707, 400973830, 404428547, 404432113, 404432865, 404469244, 404478897, 404694860, 406887479, 408294949, 408789955, 410022510, 410467324, 410586448, 410945965, 411845275, 414327152, 414327932, 414329781, 414346257, 414346439, 414639928, 414835998, 414894517, 414986533, 417465377, 417465381, 417492216, 418259232, 419310946, 420103495, 420242342, 420380455, 420658662, 420717432, 423183880, 424539259, 425929170, 425972964, 426050649, 426126450, 426142833, 426607922, 437289840, 437347469, 437412335, 437423943, 437455540, 437462252, 437597991, 437617485, 437986305, 437986507, 437986828, 437987072, 438015591, 438034813, 438038966, 438179623, 438347971, 438483573, 438547062, 438895551, 441592676, 442032555, 443548979, 447881379, 447881655, 447881895, 447887844, 448416189, 448445746, 448449012, 450942191, 452816744, 453668677, 454434495, 456610076, 456642844, 456738709, 457544600, 459451897, 459680944, 468058810, 468083581, 470964084, 471470955, 471567278, 472267822, 481177859, 481210627, 481435874, 481455115, 481485378, 481490218, 485105638, 486005878, 486383494, 487988916, 488103783, 490661867, 491574090, 491578272, 492891370, 493041952, 493441205, 493582844, 493716979, 504577572, 504740359, 505091638, 505592418, 505656212, 509516275, 514998531, 515571132, 515594682, 518712698, 521362273, 526592419, 526807354, 527348842, 538294791, 544689535, 545535009, 548544752, 548563346, 548595116, 551679010, 558034099, 560329411, 560356209, 560671018, 560671152, 560692590, 560845442, 569212097, 569474241, 572252718, 575326764, 576174758, 576190819, 582099184, 582099438, 582372519, 582558889, 586552164, 591325418, 594231990, 594243961, 605711268, 615672071, 616086845, 621792370, 624879850, 627432831, 640040548, 654392808, 658675477, 659420283, 672891587, 694768102, 705890982, 725543146, 759097578, 761686526, 795383908, 878105336, 908643300, 945213471 }; staticJArray nsHtml5AttributeName::ATTRIBUTE_HASHES = { ATTRIBUTE_HASHES_DATA, MOZ_ARRAY_LENGTH(ATTRIBUTE_HASHES_DATA) }; void nsHtml5AttributeName::initializeStatics() @@ -1079,6 +1080,7 @@ nsHtml5AttributeName::initializeStatics() ATTR_ONREPEAT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onrepeat), ALL_NO_PREFIX); ATTR_ONSELECT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onselect), ALL_NO_PREFIX); ATTR_NOTATION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::notation), ALL_NO_PREFIX); + ATTR_NOMODULE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::nomodule), ALL_NO_PREFIX); ATTR_NORESIZE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::noresize), ALL_NO_PREFIX); ATTR_MANIFEST = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::manifest), ALL_NO_PREFIX); ATTR_MATHSIZE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mathsize), ALL_NO_PREFIX); @@ -1401,7 +1403,7 @@ nsHtml5AttributeName::initializeStatics() ATTR_GLYPH_ORIENTATION_VERTICAL = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::glyph_orientation_vertical), ALL_NO_PREFIX); ATTR_COLOR_INTERPOLATION_FILTERS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::color_interpolation_filters), ALL_NO_PREFIX); ATTR_GLYPH_ORIENTATION_HORIZONTAL = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::glyph_orientation_horizontal), ALL_NO_PREFIX); - ATTRIBUTE_NAMES = new nsHtml5AttributeName*[583]; + ATTRIBUTE_NAMES = new nsHtml5AttributeName*[584]; ATTRIBUTE_NAMES[0] = ATTR_D; ATTRIBUTE_NAMES[1] = ATTR_K; ATTRIBUTE_NAMES[2] = ATTR_R; @@ -1663,328 +1665,329 @@ nsHtml5AttributeName::initializeStatics() ATTRIBUTE_NAMES[258] = ATTR_ONREPEAT; ATTRIBUTE_NAMES[259] = ATTR_ONSELECT; ATTRIBUTE_NAMES[260] = ATTR_NOTATION; - ATTRIBUTE_NAMES[261] = ATTR_NORESIZE; - ATTRIBUTE_NAMES[262] = ATTR_MANIFEST; - ATTRIBUTE_NAMES[263] = ATTR_MATHSIZE; - ATTRIBUTE_NAMES[264] = ATTR_MULTIPLE; - ATTRIBUTE_NAMES[265] = ATTR_LONGDESC; - ATTRIBUTE_NAMES[266] = ATTR_LANGUAGE; - ATTRIBUTE_NAMES[267] = ATTR_TEMPLATE; - ATTRIBUTE_NAMES[268] = ATTR_TABINDEX; - ATTRIBUTE_NAMES[269] = ATTR_PROPERTY; - ATTRIBUTE_NAMES[270] = ATTR_READONLY; - ATTRIBUTE_NAMES[271] = ATTR_SELECTED; - ATTRIBUTE_NAMES[272] = ATTR_ROWLINES; - ATTRIBUTE_NAMES[273] = ATTR_SEAMLESS; - ATTRIBUTE_NAMES[274] = ATTR_ROWALIGN; - ATTRIBUTE_NAMES[275] = ATTR_STRETCHY; - ATTRIBUTE_NAMES[276] = ATTR_REQUIRED; - ATTRIBUTE_NAMES[277] = ATTR_XML_BASE; - ATTRIBUTE_NAMES[278] = ATTR_XML_LANG; - ATTRIBUTE_NAMES[279] = ATTR_X_HEIGHT; - ATTRIBUTE_NAMES[280] = ATTR_ARIA_OWNS; - ATTRIBUTE_NAMES[281] = ATTR_AUTOFOCUS; - ATTRIBUTE_NAMES[282] = ATTR_ARIA_SORT; - ATTRIBUTE_NAMES[283] = ATTR_ACCESSKEY; - ATTRIBUTE_NAMES[284] = ATTR_ARIA_BUSY; - ATTRIBUTE_NAMES[285] = ATTR_ARIA_GRAB; - ATTRIBUTE_NAMES[286] = ATTR_AMPLITUDE; - ATTRIBUTE_NAMES[287] = ATTR_ARIA_LIVE; - ATTRIBUTE_NAMES[288] = ATTR_CLIP_RULE; - ATTRIBUTE_NAMES[289] = ATTR_CLIP_PATH; - ATTRIBUTE_NAMES[290] = ATTR_EQUALROWS; - ATTRIBUTE_NAMES[291] = ATTR_ELEVATION; - ATTRIBUTE_NAMES[292] = ATTR_DIRECTION; - ATTRIBUTE_NAMES[293] = ATTR_DRAGGABLE; - ATTRIBUTE_NAMES[294] = ATTR_FILL_RULE; - ATTRIBUTE_NAMES[295] = ATTR_FONTSTYLE; - ATTRIBUTE_NAMES[296] = ATTR_FONT_SIZE; - ATTRIBUTE_NAMES[297] = ATTR_KEYSYSTEM; - ATTRIBUTE_NAMES[298] = ATTR_KEYPOINTS; - ATTRIBUTE_NAMES[299] = ATTR_HIDEFOCUS; - ATTRIBUTE_NAMES[300] = ATTR_ONMESSAGE; - ATTRIBUTE_NAMES[301] = ATTR_INTERCEPT; - ATTRIBUTE_NAMES[302] = ATTR_ONDRAGEND; - ATTRIBUTE_NAMES[303] = ATTR_ONMOVEEND; - ATTRIBUTE_NAMES[304] = ATTR_ONINVALID; - ATTRIBUTE_NAMES[305] = ATTR_INTEGRITY; - ATTRIBUTE_NAMES[306] = ATTR_ONKEYDOWN; - ATTRIBUTE_NAMES[307] = ATTR_ONFOCUSIN; - ATTRIBUTE_NAMES[308] = ATTR_ONMOUSEUP; - ATTRIBUTE_NAMES[309] = ATTR_INPUTMODE; - ATTRIBUTE_NAMES[310] = ATTR_ONROWEXIT; - ATTRIBUTE_NAMES[311] = ATTR_MATHCOLOR; - ATTRIBUTE_NAMES[312] = ATTR_MASKUNITS; - ATTRIBUTE_NAMES[313] = ATTR_MAXLENGTH; - ATTRIBUTE_NAMES[314] = ATTR_LINEBREAK; - ATTRIBUTE_NAMES[315] = ATTR_TRANSFORM; - ATTRIBUTE_NAMES[316] = ATTR_V_HANGING; - ATTRIBUTE_NAMES[317] = ATTR_VALUETYPE; - ATTRIBUTE_NAMES[318] = ATTR_POINTSATZ; - ATTRIBUTE_NAMES[319] = ATTR_POINTSATX; - ATTRIBUTE_NAMES[320] = ATTR_POINTSATY; - ATTRIBUTE_NAMES[321] = ATTR_SYMMETRIC; - ATTRIBUTE_NAMES[322] = ATTR_SCROLLING; - ATTRIBUTE_NAMES[323] = ATTR_REPEATDUR; - ATTRIBUTE_NAMES[324] = ATTR_SELECTION; - ATTRIBUTE_NAMES[325] = ATTR_SEPARATOR; - ATTRIBUTE_NAMES[326] = ATTR_XML_SPACE; - ATTRIBUTE_NAMES[327] = ATTR_AUTOSUBMIT; - ATTRIBUTE_NAMES[328] = ATTR_ALPHABETIC; - ATTRIBUTE_NAMES[329] = ATTR_ACTIONTYPE; - ATTRIBUTE_NAMES[330] = ATTR_ACCUMULATE; - ATTRIBUTE_NAMES[331] = ATTR_ARIA_LEVEL; - ATTRIBUTE_NAMES[332] = ATTR_COLUMNSPAN; - ATTRIBUTE_NAMES[333] = ATTR_CAP_HEIGHT; - ATTRIBUTE_NAMES[334] = ATTR_BACKGROUND; - ATTRIBUTE_NAMES[335] = ATTR_GLYPH_NAME; - ATTRIBUTE_NAMES[336] = ATTR_GROUPALIGN; - ATTRIBUTE_NAMES[337] = ATTR_FONTFAMILY; - ATTRIBUTE_NAMES[338] = ATTR_FONTWEIGHT; - ATTRIBUTE_NAMES[339] = ATTR_FONT_STYLE; - ATTRIBUTE_NAMES[340] = ATTR_KEYSPLINES; - ATTRIBUTE_NAMES[341] = ATTR_HTTP_EQUIV; - ATTRIBUTE_NAMES[342] = ATTR_ONACTIVATE; - ATTRIBUTE_NAMES[343] = ATTR_OCCURRENCE; - ATTRIBUTE_NAMES[344] = ATTR_IRRELEVANT; - ATTRIBUTE_NAMES[345] = ATTR_ONDBLCLICK; - ATTRIBUTE_NAMES[346] = ATTR_ONDRAGDROP; - ATTRIBUTE_NAMES[347] = ATTR_ONKEYPRESS; - ATTRIBUTE_NAMES[348] = ATTR_ONROWENTER; - ATTRIBUTE_NAMES[349] = ATTR_ONDRAGOVER; - ATTRIBUTE_NAMES[350] = ATTR_ONFOCUSOUT; - ATTRIBUTE_NAMES[351] = ATTR_ONMOUSEOUT; - ATTRIBUTE_NAMES[352] = ATTR_NUMOCTAVES; - ATTRIBUTE_NAMES[353] = ATTR_MARKER_MID; - ATTRIBUTE_NAMES[354] = ATTR_MARKER_END; - ATTRIBUTE_NAMES[355] = ATTR_TEXTLENGTH; - ATTRIBUTE_NAMES[356] = ATTR_VISIBILITY; - ATTRIBUTE_NAMES[357] = ATTR_VIEWTARGET; - ATTRIBUTE_NAMES[358] = ATTR_VERT_ADV_Y; - ATTRIBUTE_NAMES[359] = ATTR_PATHLENGTH; - ATTRIBUTE_NAMES[360] = ATTR_REPEAT_MAX; - ATTRIBUTE_NAMES[361] = ATTR_RADIOGROUP; - ATTRIBUTE_NAMES[362] = ATTR_STOP_COLOR; - ATTRIBUTE_NAMES[363] = ATTR_SEPARATORS; - ATTRIBUTE_NAMES[364] = ATTR_REPEAT_MIN; - ATTRIBUTE_NAMES[365] = ATTR_ROWSPACING; - ATTRIBUTE_NAMES[366] = ATTR_ZOOMANDPAN; - ATTRIBUTE_NAMES[367] = ATTR_XLINK_TYPE; - ATTRIBUTE_NAMES[368] = ATTR_XLINK_ROLE; - ATTRIBUTE_NAMES[369] = ATTR_XLINK_HREF; - ATTRIBUTE_NAMES[370] = ATTR_XLINK_SHOW; - ATTRIBUTE_NAMES[371] = ATTR_ACCENTUNDER; - ATTRIBUTE_NAMES[372] = ATTR_ARIA_SECRET; - ATTRIBUTE_NAMES[373] = ATTR_ARIA_ATOMIC; - ATTRIBUTE_NAMES[374] = ATTR_ARIA_HIDDEN; - ATTRIBUTE_NAMES[375] = ATTR_ARIA_FLOWTO; - ATTRIBUTE_NAMES[376] = ATTR_ARABIC_FORM; - ATTRIBUTE_NAMES[377] = ATTR_CELLPADDING; - ATTRIBUTE_NAMES[378] = ATTR_CELLSPACING; - ATTRIBUTE_NAMES[379] = ATTR_COLUMNWIDTH; - ATTRIBUTE_NAMES[380] = ATTR_CROSSORIGIN; - ATTRIBUTE_NAMES[381] = ATTR_COLUMNALIGN; - ATTRIBUTE_NAMES[382] = ATTR_COLUMNLINES; - ATTRIBUTE_NAMES[383] = ATTR_CONTEXTMENU; - ATTRIBUTE_NAMES[384] = ATTR_BASEPROFILE; - ATTRIBUTE_NAMES[385] = ATTR_FONT_FAMILY; - ATTRIBUTE_NAMES[386] = ATTR_FRAMEBORDER; - ATTRIBUTE_NAMES[387] = ATTR_FILTERUNITS; - ATTRIBUTE_NAMES[388] = ATTR_FLOOD_COLOR; - ATTRIBUTE_NAMES[389] = ATTR_FONT_WEIGHT; - ATTRIBUTE_NAMES[390] = ATTR_HORIZ_ADV_X; - ATTRIBUTE_NAMES[391] = ATTR_ONDRAGLEAVE; - ATTRIBUTE_NAMES[392] = ATTR_ONMOUSEMOVE; - ATTRIBUTE_NAMES[393] = ATTR_ORIENTATION; - ATTRIBUTE_NAMES[394] = ATTR_ONMOUSEDOWN; - ATTRIBUTE_NAMES[395] = ATTR_ONMOUSEOVER; - ATTRIBUTE_NAMES[396] = ATTR_ONDRAGENTER; - ATTRIBUTE_NAMES[397] = ATTR_IDEOGRAPHIC; - ATTRIBUTE_NAMES[398] = ATTR_ONBEFORECUT; - ATTRIBUTE_NAMES[399] = ATTR_ONFORMINPUT; - ATTRIBUTE_NAMES[400] = ATTR_ONDRAGSTART; - ATTRIBUTE_NAMES[401] = ATTR_ONMOVESTART; - ATTRIBUTE_NAMES[402] = ATTR_MARKERUNITS; - ATTRIBUTE_NAMES[403] = ATTR_MATHVARIANT; - ATTRIBUTE_NAMES[404] = ATTR_MARGINWIDTH; - ATTRIBUTE_NAMES[405] = ATTR_MARKERWIDTH; - ATTRIBUTE_NAMES[406] = ATTR_TEXT_ANCHOR; - ATTRIBUTE_NAMES[407] = ATTR_TABLEVALUES; - ATTRIBUTE_NAMES[408] = ATTR_SCRIPTLEVEL; - ATTRIBUTE_NAMES[409] = ATTR_REPEATCOUNT; - ATTRIBUTE_NAMES[410] = ATTR_STITCHTILES; - ATTRIBUTE_NAMES[411] = ATTR_STARTOFFSET; - ATTRIBUTE_NAMES[412] = ATTR_SCROLLDELAY; - ATTRIBUTE_NAMES[413] = ATTR_XMLNS_XLINK; - ATTRIBUTE_NAMES[414] = ATTR_XLINK_TITLE; - ATTRIBUTE_NAMES[415] = ATTR_ARIA_INVALID; - ATTRIBUTE_NAMES[416] = ATTR_ARIA_PRESSED; - ATTRIBUTE_NAMES[417] = ATTR_ARIA_CHECKED; - ATTRIBUTE_NAMES[418] = ATTR_AUTOCOMPLETE; - ATTRIBUTE_NAMES[419] = ATTR_ARIA_SETSIZE; - ATTRIBUTE_NAMES[420] = ATTR_ARIA_CHANNEL; - ATTRIBUTE_NAMES[421] = ATTR_EQUALCOLUMNS; - ATTRIBUTE_NAMES[422] = ATTR_DISPLAYSTYLE; - ATTRIBUTE_NAMES[423] = ATTR_DATAFORMATAS; - ATTRIBUTE_NAMES[424] = ATTR_FILL_OPACITY; - ATTRIBUTE_NAMES[425] = ATTR_FONT_VARIANT; - ATTRIBUTE_NAMES[426] = ATTR_FONT_STRETCH; - ATTRIBUTE_NAMES[427] = ATTR_FRAMESPACING; - ATTRIBUTE_NAMES[428] = ATTR_KERNELMATRIX; - ATTRIBUTE_NAMES[429] = ATTR_ONDEACTIVATE; - ATTRIBUTE_NAMES[430] = ATTR_ONROWSDELETE; - ATTRIBUTE_NAMES[431] = ATTR_ONMOUSELEAVE; - ATTRIBUTE_NAMES[432] = ATTR_ONFORMCHANGE; - ATTRIBUTE_NAMES[433] = ATTR_ONCELLCHANGE; - ATTRIBUTE_NAMES[434] = ATTR_ONMOUSEWHEEL; - ATTRIBUTE_NAMES[435] = ATTR_ONMOUSEENTER; - ATTRIBUTE_NAMES[436] = ATTR_ONAFTERPRINT; - ATTRIBUTE_NAMES[437] = ATTR_ONBEFORECOPY; - ATTRIBUTE_NAMES[438] = ATTR_MARGINHEIGHT; - ATTRIBUTE_NAMES[439] = ATTR_MARKERHEIGHT; - ATTRIBUTE_NAMES[440] = ATTR_MARKER_START; - ATTRIBUTE_NAMES[441] = ATTR_MATHEMATICAL; - ATTRIBUTE_NAMES[442] = ATTR_LENGTHADJUST; - ATTRIBUTE_NAMES[443] = ATTR_UNSELECTABLE; - ATTRIBUTE_NAMES[444] = ATTR_UNICODE_BIDI; - ATTRIBUTE_NAMES[445] = ATTR_UNITS_PER_EM; - ATTRIBUTE_NAMES[446] = ATTR_WORD_SPACING; - ATTRIBUTE_NAMES[447] = ATTR_WRITING_MODE; - ATTRIBUTE_NAMES[448] = ATTR_V_ALPHABETIC; - ATTRIBUTE_NAMES[449] = ATTR_PATTERNUNITS; - ATTRIBUTE_NAMES[450] = ATTR_SPREADMETHOD; - ATTRIBUTE_NAMES[451] = ATTR_SURFACESCALE; - ATTRIBUTE_NAMES[452] = ATTR_STROKE_WIDTH; - ATTRIBUTE_NAMES[453] = ATTR_REPEAT_START; - ATTRIBUTE_NAMES[454] = ATTR_STDDEVIATION; - ATTRIBUTE_NAMES[455] = ATTR_STOP_OPACITY; - ATTRIBUTE_NAMES[456] = ATTR_ARIA_CONTROLS; - ATTRIBUTE_NAMES[457] = ATTR_ARIA_HASPOPUP; - ATTRIBUTE_NAMES[458] = ATTR_ACCENT_HEIGHT; - ATTRIBUTE_NAMES[459] = ATTR_ARIA_VALUENOW; - ATTRIBUTE_NAMES[460] = ATTR_ARIA_RELEVANT; - ATTRIBUTE_NAMES[461] = ATTR_ARIA_POSINSET; - ATTRIBUTE_NAMES[462] = ATTR_ARIA_VALUEMAX; - ATTRIBUTE_NAMES[463] = ATTR_ARIA_READONLY; - ATTRIBUTE_NAMES[464] = ATTR_ARIA_SELECTED; - ATTRIBUTE_NAMES[465] = ATTR_ARIA_REQUIRED; - ATTRIBUTE_NAMES[466] = ATTR_ARIA_EXPANDED; - ATTRIBUTE_NAMES[467] = ATTR_ARIA_DISABLED; - ATTRIBUTE_NAMES[468] = ATTR_ATTRIBUTETYPE; - ATTRIBUTE_NAMES[469] = ATTR_ATTRIBUTENAME; - ATTRIBUTE_NAMES[470] = ATTR_ARIA_DATATYPE; - ATTRIBUTE_NAMES[471] = ATTR_ARIA_VALUEMIN; - ATTRIBUTE_NAMES[472] = ATTR_BASEFREQUENCY; - ATTRIBUTE_NAMES[473] = ATTR_COLUMNSPACING; - ATTRIBUTE_NAMES[474] = ATTR_COLOR_PROFILE; - ATTRIBUTE_NAMES[475] = ATTR_CLIPPATHUNITS; - ATTRIBUTE_NAMES[476] = ATTR_DEFINITIONURL; - ATTRIBUTE_NAMES[477] = ATTR_GRADIENTUNITS; - ATTRIBUTE_NAMES[478] = ATTR_FLOOD_OPACITY; - ATTRIBUTE_NAMES[479] = ATTR_ONAFTERUPDATE; - ATTRIBUTE_NAMES[480] = ATTR_ONERRORUPDATE; - ATTRIBUTE_NAMES[481] = ATTR_ONBEFOREPASTE; - ATTRIBUTE_NAMES[482] = ATTR_ONLOSECAPTURE; - ATTRIBUTE_NAMES[483] = ATTR_ONCONTEXTMENU; - ATTRIBUTE_NAMES[484] = ATTR_ONSELECTSTART; - ATTRIBUTE_NAMES[485] = ATTR_ONBEFOREPRINT; - ATTRIBUTE_NAMES[486] = ATTR_MOVABLELIMITS; - ATTRIBUTE_NAMES[487] = ATTR_LINETHICKNESS; - ATTRIBUTE_NAMES[488] = ATTR_UNICODE_RANGE; - ATTRIBUTE_NAMES[489] = ATTR_THINMATHSPACE; - ATTRIBUTE_NAMES[490] = ATTR_VERT_ORIGIN_X; - ATTRIBUTE_NAMES[491] = ATTR_VERT_ORIGIN_Y; - ATTRIBUTE_NAMES[492] = ATTR_V_IDEOGRAPHIC; - ATTRIBUTE_NAMES[493] = ATTR_PRESERVEALPHA; - ATTRIBUTE_NAMES[494] = ATTR_SCRIPTMINSIZE; - ATTRIBUTE_NAMES[495] = ATTR_SPECIFICATION; - ATTRIBUTE_NAMES[496] = ATTR_XLINK_ACTUATE; - ATTRIBUTE_NAMES[497] = ATTR_XLINK_ARCROLE; - ATTRIBUTE_NAMES[498] = ATTR_ACCEPT_CHARSET; - ATTRIBUTE_NAMES[499] = ATTR_ALIGNMENTSCOPE; - ATTRIBUTE_NAMES[500] = ATTR_ARIA_MULTILINE; - ATTRIBUTE_NAMES[501] = ATTR_BASELINE_SHIFT; - ATTRIBUTE_NAMES[502] = ATTR_HORIZ_ORIGIN_X; - ATTRIBUTE_NAMES[503] = ATTR_HORIZ_ORIGIN_Y; - ATTRIBUTE_NAMES[504] = ATTR_ONBEFOREUPDATE; - ATTRIBUTE_NAMES[505] = ATTR_ONFILTERCHANGE; - ATTRIBUTE_NAMES[506] = ATTR_ONROWSINSERTED; - ATTRIBUTE_NAMES[507] = ATTR_ONBEFOREUNLOAD; - ATTRIBUTE_NAMES[508] = ATTR_MATHBACKGROUND; - ATTRIBUTE_NAMES[509] = ATTR_LETTER_SPACING; - ATTRIBUTE_NAMES[510] = ATTR_LIGHTING_COLOR; - ATTRIBUTE_NAMES[511] = ATTR_THICKMATHSPACE; - ATTRIBUTE_NAMES[512] = ATTR_TEXT_RENDERING; - ATTRIBUTE_NAMES[513] = ATTR_V_MATHEMATICAL; - ATTRIBUTE_NAMES[514] = ATTR_POINTER_EVENTS; - ATTRIBUTE_NAMES[515] = ATTR_PRIMITIVEUNITS; - ATTRIBUTE_NAMES[516] = ATTR_REFERRERPOLICY; - ATTRIBUTE_NAMES[517] = ATTR_SYSTEMLANGUAGE; - ATTRIBUTE_NAMES[518] = ATTR_STROKE_LINECAP; - ATTRIBUTE_NAMES[519] = ATTR_SUBSCRIPTSHIFT; - ATTRIBUTE_NAMES[520] = ATTR_STROKE_OPACITY; - ATTRIBUTE_NAMES[521] = ATTR_ARIA_DROPEFFECT; - ATTRIBUTE_NAMES[522] = ATTR_ARIA_LABELLEDBY; - ATTRIBUTE_NAMES[523] = ATTR_ARIA_TEMPLATEID; - ATTRIBUTE_NAMES[524] = ATTR_COLOR_RENDERING; - ATTRIBUTE_NAMES[525] = ATTR_CONTENTEDITABLE; - ATTRIBUTE_NAMES[526] = ATTR_DIFFUSECONSTANT; - ATTRIBUTE_NAMES[527] = ATTR_ONDATAAVAILABLE; - ATTRIBUTE_NAMES[528] = ATTR_ONCONTROLSELECT; - ATTRIBUTE_NAMES[529] = ATTR_IMAGE_RENDERING; - ATTRIBUTE_NAMES[530] = ATTR_MEDIUMMATHSPACE; - ATTRIBUTE_NAMES[531] = ATTR_TEXT_DECORATION; - ATTRIBUTE_NAMES[532] = ATTR_SHAPE_RENDERING; - ATTRIBUTE_NAMES[533] = ATTR_STROKE_LINEJOIN; - ATTRIBUTE_NAMES[534] = ATTR_REPEAT_TEMPLATE; - ATTRIBUTE_NAMES[535] = ATTR_ARIA_DESCRIBEDBY; - ATTRIBUTE_NAMES[536] = ATTR_FONT_SIZE_ADJUST; - ATTRIBUTE_NAMES[537] = ATTR_KERNELUNITLENGTH; - ATTRIBUTE_NAMES[538] = ATTR_ONBEFOREACTIVATE; - ATTRIBUTE_NAMES[539] = ATTR_ONPROPERTYCHANGE; - ATTRIBUTE_NAMES[540] = ATTR_ONDATASETCHANGED; - ATTRIBUTE_NAMES[541] = ATTR_MASKCONTENTUNITS; - ATTRIBUTE_NAMES[542] = ATTR_PATTERNTRANSFORM; - ATTRIBUTE_NAMES[543] = ATTR_REQUIREDFEATURES; - ATTRIBUTE_NAMES[544] = ATTR_RENDERING_INTENT; - ATTRIBUTE_NAMES[545] = ATTR_SPECULAREXPONENT; - ATTRIBUTE_NAMES[546] = ATTR_SPECULARCONSTANT; - ATTRIBUTE_NAMES[547] = ATTR_SUPERSCRIPTSHIFT; - ATTRIBUTE_NAMES[548] = ATTR_STROKE_DASHARRAY; - ATTRIBUTE_NAMES[549] = ATTR_XCHANNELSELECTOR; - ATTRIBUTE_NAMES[550] = ATTR_YCHANNELSELECTOR; - ATTRIBUTE_NAMES[551] = ATTR_ARIA_AUTOCOMPLETE; - ATTRIBUTE_NAMES[552] = ATTR_ENABLE_BACKGROUND; - ATTRIBUTE_NAMES[553] = ATTR_DOMINANT_BASELINE; - ATTRIBUTE_NAMES[554] = ATTR_GRADIENTTRANSFORM; - ATTRIBUTE_NAMES[555] = ATTR_ONBEFORDEACTIVATE; - ATTRIBUTE_NAMES[556] = ATTR_ONDATASETCOMPLETE; - ATTRIBUTE_NAMES[557] = ATTR_OVERLINE_POSITION; - ATTRIBUTE_NAMES[558] = ATTR_ONBEFOREEDITFOCUS; - ATTRIBUTE_NAMES[559] = ATTR_LIMITINGCONEANGLE; - ATTRIBUTE_NAMES[560] = ATTR_VERYTHINMATHSPACE; - ATTRIBUTE_NAMES[561] = ATTR_STROKE_DASHOFFSET; - ATTRIBUTE_NAMES[562] = ATTR_STROKE_MITERLIMIT; - ATTRIBUTE_NAMES[563] = ATTR_ALIGNMENT_BASELINE; - ATTRIBUTE_NAMES[564] = ATTR_ONREADYSTATECHANGE; - ATTRIBUTE_NAMES[565] = ATTR_OVERLINE_THICKNESS; - ATTRIBUTE_NAMES[566] = ATTR_UNDERLINE_POSITION; - ATTRIBUTE_NAMES[567] = ATTR_VERYTHICKMATHSPACE; - ATTRIBUTE_NAMES[568] = ATTR_REQUIREDEXTENSIONS; - ATTRIBUTE_NAMES[569] = ATTR_COLOR_INTERPOLATION; - ATTRIBUTE_NAMES[570] = ATTR_UNDERLINE_THICKNESS; - ATTRIBUTE_NAMES[571] = ATTR_PRESERVEASPECTRATIO; - ATTRIBUTE_NAMES[572] = ATTR_PATTERNCONTENTUNITS; - ATTRIBUTE_NAMES[573] = ATTR_ARIA_MULTISELECTABLE; - ATTRIBUTE_NAMES[574] = ATTR_SCRIPTSIZEMULTIPLIER; - ATTRIBUTE_NAMES[575] = ATTR_ARIA_ACTIVEDESCENDANT; - ATTRIBUTE_NAMES[576] = ATTR_VERYVERYTHINMATHSPACE; - ATTRIBUTE_NAMES[577] = ATTR_VERYVERYTHICKMATHSPACE; - ATTRIBUTE_NAMES[578] = ATTR_STRIKETHROUGH_POSITION; - ATTRIBUTE_NAMES[579] = ATTR_STRIKETHROUGH_THICKNESS; - ATTRIBUTE_NAMES[580] = ATTR_GLYPH_ORIENTATION_VERTICAL; - ATTRIBUTE_NAMES[581] = ATTR_COLOR_INTERPOLATION_FILTERS; - ATTRIBUTE_NAMES[582] = ATTR_GLYPH_ORIENTATION_HORIZONTAL; + ATTRIBUTE_NAMES[261] = ATTR_NOMODULE; + ATTRIBUTE_NAMES[262] = ATTR_NORESIZE; + ATTRIBUTE_NAMES[263] = ATTR_MANIFEST; + ATTRIBUTE_NAMES[264] = ATTR_MATHSIZE; + ATTRIBUTE_NAMES[265] = ATTR_MULTIPLE; + ATTRIBUTE_NAMES[266] = ATTR_LONGDESC; + ATTRIBUTE_NAMES[267] = ATTR_LANGUAGE; + ATTRIBUTE_NAMES[268] = ATTR_TEMPLATE; + ATTRIBUTE_NAMES[269] = ATTR_TABINDEX; + ATTRIBUTE_NAMES[270] = ATTR_PROPERTY; + ATTRIBUTE_NAMES[271] = ATTR_READONLY; + ATTRIBUTE_NAMES[272] = ATTR_SELECTED; + ATTRIBUTE_NAMES[273] = ATTR_ROWLINES; + ATTRIBUTE_NAMES[274] = ATTR_SEAMLESS; + ATTRIBUTE_NAMES[275] = ATTR_ROWALIGN; + ATTRIBUTE_NAMES[276] = ATTR_STRETCHY; + ATTRIBUTE_NAMES[277] = ATTR_REQUIRED; + ATTRIBUTE_NAMES[278] = ATTR_XML_BASE; + ATTRIBUTE_NAMES[279] = ATTR_XML_LANG; + ATTRIBUTE_NAMES[280] = ATTR_X_HEIGHT; + ATTRIBUTE_NAMES[281] = ATTR_ARIA_OWNS; + ATTRIBUTE_NAMES[282] = ATTR_AUTOFOCUS; + ATTRIBUTE_NAMES[283] = ATTR_ARIA_SORT; + ATTRIBUTE_NAMES[284] = ATTR_ACCESSKEY; + ATTRIBUTE_NAMES[285] = ATTR_ARIA_BUSY; + ATTRIBUTE_NAMES[286] = ATTR_ARIA_GRAB; + ATTRIBUTE_NAMES[287] = ATTR_AMPLITUDE; + ATTRIBUTE_NAMES[288] = ATTR_ARIA_LIVE; + ATTRIBUTE_NAMES[289] = ATTR_CLIP_RULE; + ATTRIBUTE_NAMES[290] = ATTR_CLIP_PATH; + ATTRIBUTE_NAMES[291] = ATTR_EQUALROWS; + ATTRIBUTE_NAMES[292] = ATTR_ELEVATION; + ATTRIBUTE_NAMES[293] = ATTR_DIRECTION; + ATTRIBUTE_NAMES[294] = ATTR_DRAGGABLE; + ATTRIBUTE_NAMES[295] = ATTR_FILL_RULE; + ATTRIBUTE_NAMES[296] = ATTR_FONTSTYLE; + ATTRIBUTE_NAMES[297] = ATTR_FONT_SIZE; + ATTRIBUTE_NAMES[298] = ATTR_KEYSYSTEM; + ATTRIBUTE_NAMES[299] = ATTR_KEYPOINTS; + ATTRIBUTE_NAMES[300] = ATTR_HIDEFOCUS; + ATTRIBUTE_NAMES[301] = ATTR_ONMESSAGE; + ATTRIBUTE_NAMES[302] = ATTR_INTERCEPT; + ATTRIBUTE_NAMES[303] = ATTR_ONDRAGEND; + ATTRIBUTE_NAMES[304] = ATTR_ONMOVEEND; + ATTRIBUTE_NAMES[305] = ATTR_ONINVALID; + ATTRIBUTE_NAMES[306] = ATTR_INTEGRITY; + ATTRIBUTE_NAMES[307] = ATTR_ONKEYDOWN; + ATTRIBUTE_NAMES[308] = ATTR_ONFOCUSIN; + ATTRIBUTE_NAMES[309] = ATTR_ONMOUSEUP; + ATTRIBUTE_NAMES[310] = ATTR_INPUTMODE; + ATTRIBUTE_NAMES[311] = ATTR_ONROWEXIT; + ATTRIBUTE_NAMES[312] = ATTR_MATHCOLOR; + ATTRIBUTE_NAMES[313] = ATTR_MASKUNITS; + ATTRIBUTE_NAMES[314] = ATTR_MAXLENGTH; + ATTRIBUTE_NAMES[315] = ATTR_LINEBREAK; + ATTRIBUTE_NAMES[316] = ATTR_TRANSFORM; + ATTRIBUTE_NAMES[317] = ATTR_V_HANGING; + ATTRIBUTE_NAMES[318] = ATTR_VALUETYPE; + ATTRIBUTE_NAMES[319] = ATTR_POINTSATZ; + ATTRIBUTE_NAMES[320] = ATTR_POINTSATX; + ATTRIBUTE_NAMES[321] = ATTR_POINTSATY; + ATTRIBUTE_NAMES[322] = ATTR_SYMMETRIC; + ATTRIBUTE_NAMES[323] = ATTR_SCROLLING; + ATTRIBUTE_NAMES[324] = ATTR_REPEATDUR; + ATTRIBUTE_NAMES[325] = ATTR_SELECTION; + ATTRIBUTE_NAMES[326] = ATTR_SEPARATOR; + ATTRIBUTE_NAMES[327] = ATTR_XML_SPACE; + ATTRIBUTE_NAMES[328] = ATTR_AUTOSUBMIT; + ATTRIBUTE_NAMES[329] = ATTR_ALPHABETIC; + ATTRIBUTE_NAMES[330] = ATTR_ACTIONTYPE; + ATTRIBUTE_NAMES[331] = ATTR_ACCUMULATE; + ATTRIBUTE_NAMES[332] = ATTR_ARIA_LEVEL; + ATTRIBUTE_NAMES[333] = ATTR_COLUMNSPAN; + ATTRIBUTE_NAMES[334] = ATTR_CAP_HEIGHT; + ATTRIBUTE_NAMES[335] = ATTR_BACKGROUND; + ATTRIBUTE_NAMES[336] = ATTR_GLYPH_NAME; + ATTRIBUTE_NAMES[337] = ATTR_GROUPALIGN; + ATTRIBUTE_NAMES[338] = ATTR_FONTFAMILY; + ATTRIBUTE_NAMES[339] = ATTR_FONTWEIGHT; + ATTRIBUTE_NAMES[340] = ATTR_FONT_STYLE; + ATTRIBUTE_NAMES[341] = ATTR_KEYSPLINES; + ATTRIBUTE_NAMES[342] = ATTR_HTTP_EQUIV; + ATTRIBUTE_NAMES[343] = ATTR_ONACTIVATE; + ATTRIBUTE_NAMES[344] = ATTR_OCCURRENCE; + ATTRIBUTE_NAMES[345] = ATTR_IRRELEVANT; + ATTRIBUTE_NAMES[346] = ATTR_ONDBLCLICK; + ATTRIBUTE_NAMES[347] = ATTR_ONDRAGDROP; + ATTRIBUTE_NAMES[348] = ATTR_ONKEYPRESS; + ATTRIBUTE_NAMES[349] = ATTR_ONROWENTER; + ATTRIBUTE_NAMES[350] = ATTR_ONDRAGOVER; + ATTRIBUTE_NAMES[351] = ATTR_ONFOCUSOUT; + ATTRIBUTE_NAMES[352] = ATTR_ONMOUSEOUT; + ATTRIBUTE_NAMES[353] = ATTR_NUMOCTAVES; + ATTRIBUTE_NAMES[354] = ATTR_MARKER_MID; + ATTRIBUTE_NAMES[355] = ATTR_MARKER_END; + ATTRIBUTE_NAMES[356] = ATTR_TEXTLENGTH; + ATTRIBUTE_NAMES[357] = ATTR_VISIBILITY; + ATTRIBUTE_NAMES[358] = ATTR_VIEWTARGET; + ATTRIBUTE_NAMES[359] = ATTR_VERT_ADV_Y; + ATTRIBUTE_NAMES[360] = ATTR_PATHLENGTH; + ATTRIBUTE_NAMES[361] = ATTR_REPEAT_MAX; + ATTRIBUTE_NAMES[362] = ATTR_RADIOGROUP; + ATTRIBUTE_NAMES[363] = ATTR_STOP_COLOR; + ATTRIBUTE_NAMES[364] = ATTR_SEPARATORS; + ATTRIBUTE_NAMES[365] = ATTR_REPEAT_MIN; + ATTRIBUTE_NAMES[366] = ATTR_ROWSPACING; + ATTRIBUTE_NAMES[367] = ATTR_ZOOMANDPAN; + ATTRIBUTE_NAMES[368] = ATTR_XLINK_TYPE; + ATTRIBUTE_NAMES[369] = ATTR_XLINK_ROLE; + ATTRIBUTE_NAMES[370] = ATTR_XLINK_HREF; + ATTRIBUTE_NAMES[371] = ATTR_XLINK_SHOW; + ATTRIBUTE_NAMES[372] = ATTR_ACCENTUNDER; + ATTRIBUTE_NAMES[373] = ATTR_ARIA_SECRET; + ATTRIBUTE_NAMES[374] = ATTR_ARIA_ATOMIC; + ATTRIBUTE_NAMES[375] = ATTR_ARIA_HIDDEN; + ATTRIBUTE_NAMES[376] = ATTR_ARIA_FLOWTO; + ATTRIBUTE_NAMES[377] = ATTR_ARABIC_FORM; + ATTRIBUTE_NAMES[378] = ATTR_CELLPADDING; + ATTRIBUTE_NAMES[379] = ATTR_CELLSPACING; + ATTRIBUTE_NAMES[380] = ATTR_COLUMNWIDTH; + ATTRIBUTE_NAMES[381] = ATTR_CROSSORIGIN; + ATTRIBUTE_NAMES[382] = ATTR_COLUMNALIGN; + ATTRIBUTE_NAMES[383] = ATTR_COLUMNLINES; + ATTRIBUTE_NAMES[384] = ATTR_CONTEXTMENU; + ATTRIBUTE_NAMES[385] = ATTR_BASEPROFILE; + ATTRIBUTE_NAMES[386] = ATTR_FONT_FAMILY; + ATTRIBUTE_NAMES[387] = ATTR_FRAMEBORDER; + ATTRIBUTE_NAMES[388] = ATTR_FILTERUNITS; + ATTRIBUTE_NAMES[389] = ATTR_FLOOD_COLOR; + ATTRIBUTE_NAMES[390] = ATTR_FONT_WEIGHT; + ATTRIBUTE_NAMES[391] = ATTR_HORIZ_ADV_X; + ATTRIBUTE_NAMES[392] = ATTR_ONDRAGLEAVE; + ATTRIBUTE_NAMES[393] = ATTR_ONMOUSEMOVE; + ATTRIBUTE_NAMES[394] = ATTR_ORIENTATION; + ATTRIBUTE_NAMES[395] = ATTR_ONMOUSEDOWN; + ATTRIBUTE_NAMES[396] = ATTR_ONMOUSEOVER; + ATTRIBUTE_NAMES[397] = ATTR_ONDRAGENTER; + ATTRIBUTE_NAMES[398] = ATTR_IDEOGRAPHIC; + ATTRIBUTE_NAMES[399] = ATTR_ONBEFORECUT; + ATTRIBUTE_NAMES[400] = ATTR_ONFORMINPUT; + ATTRIBUTE_NAMES[401] = ATTR_ONDRAGSTART; + ATTRIBUTE_NAMES[402] = ATTR_ONMOVESTART; + ATTRIBUTE_NAMES[403] = ATTR_MARKERUNITS; + ATTRIBUTE_NAMES[404] = ATTR_MATHVARIANT; + ATTRIBUTE_NAMES[405] = ATTR_MARGINWIDTH; + ATTRIBUTE_NAMES[406] = ATTR_MARKERWIDTH; + ATTRIBUTE_NAMES[407] = ATTR_TEXT_ANCHOR; + ATTRIBUTE_NAMES[408] = ATTR_TABLEVALUES; + ATTRIBUTE_NAMES[409] = ATTR_SCRIPTLEVEL; + ATTRIBUTE_NAMES[410] = ATTR_REPEATCOUNT; + ATTRIBUTE_NAMES[411] = ATTR_STITCHTILES; + ATTRIBUTE_NAMES[412] = ATTR_STARTOFFSET; + ATTRIBUTE_NAMES[413] = ATTR_SCROLLDELAY; + ATTRIBUTE_NAMES[414] = ATTR_XMLNS_XLINK; + ATTRIBUTE_NAMES[415] = ATTR_XLINK_TITLE; + ATTRIBUTE_NAMES[416] = ATTR_ARIA_INVALID; + ATTRIBUTE_NAMES[417] = ATTR_ARIA_PRESSED; + ATTRIBUTE_NAMES[418] = ATTR_ARIA_CHECKED; + ATTRIBUTE_NAMES[419] = ATTR_AUTOCOMPLETE; + ATTRIBUTE_NAMES[420] = ATTR_ARIA_SETSIZE; + ATTRIBUTE_NAMES[421] = ATTR_ARIA_CHANNEL; + ATTRIBUTE_NAMES[422] = ATTR_EQUALCOLUMNS; + ATTRIBUTE_NAMES[423] = ATTR_DISPLAYSTYLE; + ATTRIBUTE_NAMES[424] = ATTR_DATAFORMATAS; + ATTRIBUTE_NAMES[425] = ATTR_FILL_OPACITY; + ATTRIBUTE_NAMES[426] = ATTR_FONT_VARIANT; + ATTRIBUTE_NAMES[427] = ATTR_FONT_STRETCH; + ATTRIBUTE_NAMES[428] = ATTR_FRAMESPACING; + ATTRIBUTE_NAMES[429] = ATTR_KERNELMATRIX; + ATTRIBUTE_NAMES[430] = ATTR_ONDEACTIVATE; + ATTRIBUTE_NAMES[431] = ATTR_ONROWSDELETE; + ATTRIBUTE_NAMES[432] = ATTR_ONMOUSELEAVE; + ATTRIBUTE_NAMES[433] = ATTR_ONFORMCHANGE; + ATTRIBUTE_NAMES[434] = ATTR_ONCELLCHANGE; + ATTRIBUTE_NAMES[435] = ATTR_ONMOUSEWHEEL; + ATTRIBUTE_NAMES[436] = ATTR_ONMOUSEENTER; + ATTRIBUTE_NAMES[437] = ATTR_ONAFTERPRINT; + ATTRIBUTE_NAMES[438] = ATTR_ONBEFORECOPY; + ATTRIBUTE_NAMES[439] = ATTR_MARGINHEIGHT; + ATTRIBUTE_NAMES[440] = ATTR_MARKERHEIGHT; + ATTRIBUTE_NAMES[441] = ATTR_MARKER_START; + ATTRIBUTE_NAMES[442] = ATTR_MATHEMATICAL; + ATTRIBUTE_NAMES[443] = ATTR_LENGTHADJUST; + ATTRIBUTE_NAMES[444] = ATTR_UNSELECTABLE; + ATTRIBUTE_NAMES[445] = ATTR_UNICODE_BIDI; + ATTRIBUTE_NAMES[446] = ATTR_UNITS_PER_EM; + ATTRIBUTE_NAMES[447] = ATTR_WORD_SPACING; + ATTRIBUTE_NAMES[448] = ATTR_WRITING_MODE; + ATTRIBUTE_NAMES[449] = ATTR_V_ALPHABETIC; + ATTRIBUTE_NAMES[450] = ATTR_PATTERNUNITS; + ATTRIBUTE_NAMES[451] = ATTR_SPREADMETHOD; + ATTRIBUTE_NAMES[452] = ATTR_SURFACESCALE; + ATTRIBUTE_NAMES[453] = ATTR_STROKE_WIDTH; + ATTRIBUTE_NAMES[454] = ATTR_REPEAT_START; + ATTRIBUTE_NAMES[455] = ATTR_STDDEVIATION; + ATTRIBUTE_NAMES[456] = ATTR_STOP_OPACITY; + ATTRIBUTE_NAMES[457] = ATTR_ARIA_CONTROLS; + ATTRIBUTE_NAMES[458] = ATTR_ARIA_HASPOPUP; + ATTRIBUTE_NAMES[459] = ATTR_ACCENT_HEIGHT; + ATTRIBUTE_NAMES[460] = ATTR_ARIA_VALUENOW; + ATTRIBUTE_NAMES[461] = ATTR_ARIA_RELEVANT; + ATTRIBUTE_NAMES[462] = ATTR_ARIA_POSINSET; + ATTRIBUTE_NAMES[463] = ATTR_ARIA_VALUEMAX; + ATTRIBUTE_NAMES[464] = ATTR_ARIA_READONLY; + ATTRIBUTE_NAMES[465] = ATTR_ARIA_SELECTED; + ATTRIBUTE_NAMES[466] = ATTR_ARIA_REQUIRED; + ATTRIBUTE_NAMES[467] = ATTR_ARIA_EXPANDED; + ATTRIBUTE_NAMES[468] = ATTR_ARIA_DISABLED; + ATTRIBUTE_NAMES[469] = ATTR_ATTRIBUTETYPE; + ATTRIBUTE_NAMES[470] = ATTR_ATTRIBUTENAME; + ATTRIBUTE_NAMES[471] = ATTR_ARIA_DATATYPE; + ATTRIBUTE_NAMES[472] = ATTR_ARIA_VALUEMIN; + ATTRIBUTE_NAMES[473] = ATTR_BASEFREQUENCY; + ATTRIBUTE_NAMES[474] = ATTR_COLUMNSPACING; + ATTRIBUTE_NAMES[475] = ATTR_COLOR_PROFILE; + ATTRIBUTE_NAMES[476] = ATTR_CLIPPATHUNITS; + ATTRIBUTE_NAMES[477] = ATTR_DEFINITIONURL; + ATTRIBUTE_NAMES[478] = ATTR_GRADIENTUNITS; + ATTRIBUTE_NAMES[479] = ATTR_FLOOD_OPACITY; + ATTRIBUTE_NAMES[480] = ATTR_ONAFTERUPDATE; + ATTRIBUTE_NAMES[481] = ATTR_ONERRORUPDATE; + ATTRIBUTE_NAMES[482] = ATTR_ONBEFOREPASTE; + ATTRIBUTE_NAMES[483] = ATTR_ONLOSECAPTURE; + ATTRIBUTE_NAMES[484] = ATTR_ONCONTEXTMENU; + ATTRIBUTE_NAMES[485] = ATTR_ONSELECTSTART; + ATTRIBUTE_NAMES[486] = ATTR_ONBEFOREPRINT; + ATTRIBUTE_NAMES[487] = ATTR_MOVABLELIMITS; + ATTRIBUTE_NAMES[488] = ATTR_LINETHICKNESS; + ATTRIBUTE_NAMES[489] = ATTR_UNICODE_RANGE; + ATTRIBUTE_NAMES[490] = ATTR_THINMATHSPACE; + ATTRIBUTE_NAMES[491] = ATTR_VERT_ORIGIN_X; + ATTRIBUTE_NAMES[492] = ATTR_VERT_ORIGIN_Y; + ATTRIBUTE_NAMES[493] = ATTR_V_IDEOGRAPHIC; + ATTRIBUTE_NAMES[494] = ATTR_PRESERVEALPHA; + ATTRIBUTE_NAMES[495] = ATTR_SCRIPTMINSIZE; + ATTRIBUTE_NAMES[496] = ATTR_SPECIFICATION; + ATTRIBUTE_NAMES[497] = ATTR_XLINK_ACTUATE; + ATTRIBUTE_NAMES[498] = ATTR_XLINK_ARCROLE; + ATTRIBUTE_NAMES[499] = ATTR_ACCEPT_CHARSET; + ATTRIBUTE_NAMES[500] = ATTR_ALIGNMENTSCOPE; + ATTRIBUTE_NAMES[501] = ATTR_ARIA_MULTILINE; + ATTRIBUTE_NAMES[502] = ATTR_BASELINE_SHIFT; + ATTRIBUTE_NAMES[503] = ATTR_HORIZ_ORIGIN_X; + ATTRIBUTE_NAMES[504] = ATTR_HORIZ_ORIGIN_Y; + ATTRIBUTE_NAMES[505] = ATTR_ONBEFOREUPDATE; + ATTRIBUTE_NAMES[506] = ATTR_ONFILTERCHANGE; + ATTRIBUTE_NAMES[507] = ATTR_ONROWSINSERTED; + ATTRIBUTE_NAMES[508] = ATTR_ONBEFOREUNLOAD; + ATTRIBUTE_NAMES[509] = ATTR_MATHBACKGROUND; + ATTRIBUTE_NAMES[510] = ATTR_LETTER_SPACING; + ATTRIBUTE_NAMES[511] = ATTR_LIGHTING_COLOR; + ATTRIBUTE_NAMES[512] = ATTR_THICKMATHSPACE; + ATTRIBUTE_NAMES[513] = ATTR_TEXT_RENDERING; + ATTRIBUTE_NAMES[514] = ATTR_V_MATHEMATICAL; + ATTRIBUTE_NAMES[515] = ATTR_POINTER_EVENTS; + ATTRIBUTE_NAMES[516] = ATTR_PRIMITIVEUNITS; + ATTRIBUTE_NAMES[517] = ATTR_REFERRERPOLICY; + ATTRIBUTE_NAMES[518] = ATTR_SYSTEMLANGUAGE; + ATTRIBUTE_NAMES[519] = ATTR_STROKE_LINECAP; + ATTRIBUTE_NAMES[520] = ATTR_SUBSCRIPTSHIFT; + ATTRIBUTE_NAMES[521] = ATTR_STROKE_OPACITY; + ATTRIBUTE_NAMES[522] = ATTR_ARIA_DROPEFFECT; + ATTRIBUTE_NAMES[523] = ATTR_ARIA_LABELLEDBY; + ATTRIBUTE_NAMES[524] = ATTR_ARIA_TEMPLATEID; + ATTRIBUTE_NAMES[525] = ATTR_COLOR_RENDERING; + ATTRIBUTE_NAMES[526] = ATTR_CONTENTEDITABLE; + ATTRIBUTE_NAMES[527] = ATTR_DIFFUSECONSTANT; + ATTRIBUTE_NAMES[528] = ATTR_ONDATAAVAILABLE; + ATTRIBUTE_NAMES[529] = ATTR_ONCONTROLSELECT; + ATTRIBUTE_NAMES[530] = ATTR_IMAGE_RENDERING; + ATTRIBUTE_NAMES[531] = ATTR_MEDIUMMATHSPACE; + ATTRIBUTE_NAMES[532] = ATTR_TEXT_DECORATION; + ATTRIBUTE_NAMES[533] = ATTR_SHAPE_RENDERING; + ATTRIBUTE_NAMES[534] = ATTR_STROKE_LINEJOIN; + ATTRIBUTE_NAMES[535] = ATTR_REPEAT_TEMPLATE; + ATTRIBUTE_NAMES[536] = ATTR_ARIA_DESCRIBEDBY; + ATTRIBUTE_NAMES[537] = ATTR_FONT_SIZE_ADJUST; + ATTRIBUTE_NAMES[538] = ATTR_KERNELUNITLENGTH; + ATTRIBUTE_NAMES[539] = ATTR_ONBEFOREACTIVATE; + ATTRIBUTE_NAMES[540] = ATTR_ONPROPERTYCHANGE; + ATTRIBUTE_NAMES[541] = ATTR_ONDATASETCHANGED; + ATTRIBUTE_NAMES[542] = ATTR_MASKCONTENTUNITS; + ATTRIBUTE_NAMES[543] = ATTR_PATTERNTRANSFORM; + ATTRIBUTE_NAMES[544] = ATTR_REQUIREDFEATURES; + ATTRIBUTE_NAMES[545] = ATTR_RENDERING_INTENT; + ATTRIBUTE_NAMES[546] = ATTR_SPECULAREXPONENT; + ATTRIBUTE_NAMES[547] = ATTR_SPECULARCONSTANT; + ATTRIBUTE_NAMES[548] = ATTR_SUPERSCRIPTSHIFT; + ATTRIBUTE_NAMES[549] = ATTR_STROKE_DASHARRAY; + ATTRIBUTE_NAMES[550] = ATTR_XCHANNELSELECTOR; + ATTRIBUTE_NAMES[551] = ATTR_YCHANNELSELECTOR; + ATTRIBUTE_NAMES[552] = ATTR_ARIA_AUTOCOMPLETE; + ATTRIBUTE_NAMES[553] = ATTR_ENABLE_BACKGROUND; + ATTRIBUTE_NAMES[554] = ATTR_DOMINANT_BASELINE; + ATTRIBUTE_NAMES[555] = ATTR_GRADIENTTRANSFORM; + ATTRIBUTE_NAMES[556] = ATTR_ONBEFORDEACTIVATE; + ATTRIBUTE_NAMES[557] = ATTR_ONDATASETCOMPLETE; + ATTRIBUTE_NAMES[558] = ATTR_OVERLINE_POSITION; + ATTRIBUTE_NAMES[559] = ATTR_ONBEFOREEDITFOCUS; + ATTRIBUTE_NAMES[560] = ATTR_LIMITINGCONEANGLE; + ATTRIBUTE_NAMES[561] = ATTR_VERYTHINMATHSPACE; + ATTRIBUTE_NAMES[562] = ATTR_STROKE_DASHOFFSET; + ATTRIBUTE_NAMES[563] = ATTR_STROKE_MITERLIMIT; + ATTRIBUTE_NAMES[564] = ATTR_ALIGNMENT_BASELINE; + ATTRIBUTE_NAMES[565] = ATTR_ONREADYSTATECHANGE; + ATTRIBUTE_NAMES[566] = ATTR_OVERLINE_THICKNESS; + ATTRIBUTE_NAMES[567] = ATTR_UNDERLINE_POSITION; + ATTRIBUTE_NAMES[568] = ATTR_VERYTHICKMATHSPACE; + ATTRIBUTE_NAMES[569] = ATTR_REQUIREDEXTENSIONS; + ATTRIBUTE_NAMES[570] = ATTR_COLOR_INTERPOLATION; + ATTRIBUTE_NAMES[571] = ATTR_UNDERLINE_THICKNESS; + ATTRIBUTE_NAMES[572] = ATTR_PRESERVEASPECTRATIO; + ATTRIBUTE_NAMES[573] = ATTR_PATTERNCONTENTUNITS; + ATTRIBUTE_NAMES[574] = ATTR_ARIA_MULTISELECTABLE; + ATTRIBUTE_NAMES[575] = ATTR_SCRIPTSIZEMULTIPLIER; + ATTRIBUTE_NAMES[576] = ATTR_ARIA_ACTIVEDESCENDANT; + ATTRIBUTE_NAMES[577] = ATTR_VERYVERYTHINMATHSPACE; + ATTRIBUTE_NAMES[578] = ATTR_VERYVERYTHICKMATHSPACE; + ATTRIBUTE_NAMES[579] = ATTR_STRIKETHROUGH_POSITION; + ATTRIBUTE_NAMES[580] = ATTR_STRIKETHROUGH_THICKNESS; + ATTRIBUTE_NAMES[581] = ATTR_GLYPH_ORIENTATION_VERTICAL; + ATTRIBUTE_NAMES[582] = ATTR_COLOR_INTERPOLATION_FILTERS; + ATTRIBUTE_NAMES[583] = ATTR_GLYPH_ORIENTATION_HORIZONTAL; } void @@ -2259,6 +2262,7 @@ nsHtml5AttributeName::releaseStatics() delete ATTR_ONREPEAT; delete ATTR_ONSELECT; delete ATTR_NOTATION; + delete ATTR_NOMODULE; delete ATTR_NORESIZE; delete ATTR_MANIFEST; delete ATTR_MATHSIZE; diff --git a/parser/html/nsHtml5AttributeName.h b/parser/html/nsHtml5AttributeName.h index e12fb35cc..179dc649f 100644 --- a/parser/html/nsHtml5AttributeName.h +++ b/parser/html/nsHtml5AttributeName.h @@ -355,6 +355,7 @@ class nsHtml5AttributeName static nsHtml5AttributeName* ATTR_ONREPEAT; static nsHtml5AttributeName* ATTR_ONSELECT; static nsHtml5AttributeName* ATTR_NOTATION; + static nsHtml5AttributeName* ATTR_NOMODULE; static nsHtml5AttributeName* ATTR_NORESIZE; static nsHtml5AttributeName* ATTR_MANIFEST; static nsHtml5AttributeName* ATTR_MATHSIZE; -- cgit v1.2.3 From 798f0bd3ad1f5b1abd9ed7c4832dbbac51be9f8b Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 5 Sep 2020 20:36:39 +0000 Subject: Fix build error. --- parser/htmlparser/nsElementTable.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'parser') diff --git a/parser/htmlparser/nsElementTable.cpp b/parser/htmlparser/nsElementTable.cpp index 5c69726d1..5ce18aded 100644 --- a/parser/htmlparser/nsElementTable.cpp +++ b/parser/htmlparser/nsElementTable.cpp @@ -319,10 +319,6 @@ const nsHTMLElement gHTMLElements[] = { /*tag*/ eHTMLTag_mark, /*parent,leaf*/ kSpecial, false }, - { - /*tag*/ eHTMLTag_marquee, - /*parent,leaf*/ kSpecial, false - }, { /*tag*/ eHTMLTag_menu, /*parent,leaf*/ kList, false -- cgit v1.2.3 From 37efb98518ae720e9308a8cd4732817a46e15f17 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 23 Sep 2020 01:02:29 +0000 Subject: [SVG] Only fire the SVG onload when scripting is enabled and allowed --- parser/html/nsHtml5TreeBuilderCppSupplement.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'parser') diff --git a/parser/html/nsHtml5TreeBuilderCppSupplement.h b/parser/html/nsHtml5TreeBuilderCppSupplement.h index f0326a20a..51966077c 100644 --- a/parser/html/nsHtml5TreeBuilderCppSupplement.h +++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h @@ -922,6 +922,9 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent } if (aNamespace == kNameSpaceID_SVG) { if (aName == nsHtml5Atoms::svg) { + if (!scriptingEnabled || mPreventScriptExecution) { + return; + } if (mBuilder) { nsHtml5TreeOperation::SvgLoad(static_cast(aElement)); return; -- cgit v1.2.3