diff --git a/accessible/base/HTMLMarkupMap.h b/accessible/base/HTMLMarkupMap.h index 732fc40cc4af..ecd3ba4071c6 100644 --- a/accessible/base/HTMLMarkupMap.h +++ b/accessible/base/HTMLMarkupMap.h @@ -425,5 +425,3 @@ MARKUPMAP( return new HTMLMeterAccessible(aElement, aContext->Document()); }, roles::METER) - -MARKUPMAP(search, New_HyperText, roles::LANDMARK) diff --git a/accessible/basetypes/Accessible.cpp b/accessible/basetypes/Accessible.cpp index 5a3e14022650..ad93e7da2a6d 100644 --- a/accessible/basetypes/Accessible.cpp +++ b/accessible/basetypes/Accessible.cpp @@ -554,10 +554,6 @@ nsStaticAtom* Accessible::LandmarkRole() const { } } - if (tagName == nsGkAtoms::search) { - return nsGkAtoms::search; - } - const nsRoleMapEntry* roleMapEntry = ARIARoleMap(); return roleMapEntry && roleMapEntry->IsOfType(eLandmark) ? roleMapEntry->roleAtom diff --git a/accessible/tests/mochitest/elm/test_HTMLSpec.html b/accessible/tests/mochitest/elm/test_HTMLSpec.html index 7ec3b7a246ad..14e25b74b597 100644 --- a/accessible/tests/mochitest/elm/test_HTMLSpec.html +++ b/accessible/tests/mochitest/elm/test_HTMLSpec.html @@ -1328,16 +1328,6 @@ }; testElm("samp_container", obj); - // //////////////////////////////////////////////////////////////////////// - // HTML:search - - obj = { - role: ROLE_LANDMARK, - attributes: { "xml-roles": "search" }, - interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ], - }; - testElm("search", obj); - // //////////////////////////////////////////////////////////////////////// // HTML:section without an accessible name @@ -2001,7 +1991,6 @@

normalRemoved

normalsample

- search
section
named section

normalsmall

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 0f741c082b4d..cdc5be8ef209 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -1201,7 +1201,7 @@ bool Element::CanAttachShadowDOM() const { * If context object's local name is not * a valid custom element name, "article", "aside", "blockquote", * "body", "div", "footer", "h1", "h2", "h3", "h4", "h5", "h6", - * "header", "main" "nav", "p", "section", "search", or "span", + * "header", "main" "nav", "p", "section", or "span", * return false. */ nsAtom* nameAtom = NodeInfo()->NameAtom(); @@ -1215,8 +1215,7 @@ bool Element::CanAttachShadowDOM() const { nameAtom == nsGkAtoms::h5 || nameAtom == nsGkAtoms::h6 || nameAtom == nsGkAtoms::header || nameAtom == nsGkAtoms::main || nameAtom == nsGkAtoms::nav || nameAtom == nsGkAtoms::p || - nameAtom == nsGkAtoms::section || nameAtom == nsGkAtoms::search || - nameAtom == nsGkAtoms::span)) { + nameAtom == nsGkAtoms::section || nameAtom == nsGkAtoms::span)) { return false; } diff --git a/layout/style/res/html.css b/layout/style/res/html.css index 7d96d61e58c8..e6a520d349d5 100644 --- a/layout/style/res/html.css +++ b/layout/style/res/html.css @@ -82,7 +82,6 @@ ol, p, plaintext, pre, -search, section, summary, table, @@ -125,7 +124,6 @@ hgroup, html, main, nav, -search, section, summary { display: block; diff --git a/parser/html/javasrc/ElementName.java b/parser/html/javasrc/ElementName.java index ad0b0b6150d2..9ee2ad01520d 100644 --- a/parser/html/javasrc/ElementName.java +++ b/parser/html/javasrc/ElementName.java @@ -539,8 +539,8 @@ public final class ElementName // return "DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU"; // case TreeBuilder.FIELDSET: // return "FIELDSET"; -// case TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY: -// return "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_SEARCH_OR_SECTION_OR_SUMMARY"; +// case TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY: +// return "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"; // case TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR: // return "RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR"; // case TreeBuilder.RB_OR_RTC: @@ -653,836 +653,832 @@ public final class ElementName // } // START GENERATED CODE -public static final ElementName BIG = new ElementName("big", "big", +public static final ElementName BIG = new ElementName("big", "big", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName BDI = new ElementName("bdi", "bdi", +public static final ElementName BDI = new ElementName("bdi", "bdi", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName BDO = new ElementName("bdo", "bdo", +public static final ElementName BDO = new ElementName("bdo", "bdo", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName COL = new ElementName("col", "col", +public static final ElementName COL = new ElementName("col", "col", // CPPONLY: NS_NewHTMLTableColElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.COL | SPECIAL); -public static final ElementName DEL = new ElementName("del", "del", +public static final ElementName DEL = new ElementName("del", "del", // CPPONLY: NS_NewHTMLModElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName DFN = new ElementName("dfn", "dfn", +public static final ElementName DFN = new ElementName("dfn", "dfn", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName DIR = new ElementName("dir", "dir", +public static final ElementName DIR = new ElementName("dir", "dir", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName DIV = new ElementName("div", "div", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName DIV = new ElementName("div", "div", // CPPONLY: NS_NewHTMLDivElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL); -public static final ElementName IMG = new ElementName("img", "img", +public static final ElementName IMG = new ElementName("img", "img", // CPPONLY: NS_NewHTMLImageElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.IMG | SPECIAL); -public static final ElementName INS = new ElementName("ins", "ins", +public static final ElementName INS = new ElementName("ins", "ins", // CPPONLY: NS_NewHTMLModElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName KBD = new ElementName("kbd", "kbd", +public static final ElementName KBD = new ElementName("kbd", "kbd", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName MAP = new ElementName("map", "map", +public static final ElementName MAP = new ElementName("map", "map", // CPPONLY: NS_NewHTMLMapElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName NAV = new ElementName("nav", "nav", +public static final ElementName NAV = new ElementName("nav", "nav", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName PRE = new ElementName("pre", "pre", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName PRE = new ElementName("pre", "pre", // CPPONLY: NS_NewHTMLPreElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.PRE_OR_LISTING | SPECIAL); -public static final ElementName A = new ElementName("a", "a", +public static final ElementName A = new ElementName("a", "a", // CPPONLY: NS_NewHTMLAnchorElement, -// CPPONLY: NS_NewSVGAElement, +// CPPONLY: NS_NewSVGAElement, TreeBuilder.A); -public static final ElementName B = new ElementName("b", "b", +public static final ElementName B = new ElementName("b", "b", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName RTC = new ElementName("rtc", "rtc", +public static final ElementName RTC = new ElementName("rtc", "rtc", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RB_OR_RTC | OPTIONAL_END_TAG); -public static final ElementName SUB = new ElementName("sub", "sub", +public static final ElementName SUB = new ElementName("sub", "sub", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR); -public static final ElementName SVG = new ElementName("svg", "svg", +public static final ElementName SVG = new ElementName("svg", "svg", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGSVGElement, +// CPPONLY: NS_NewSVGSVGElement, TreeBuilder.SVG); -public static final ElementName SUP = new ElementName("sup", "sup", +public static final ElementName SUP = new ElementName("sup", "sup", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR); -public static final ElementName SET = new ElementName("set", "set", +public static final ElementName SET = new ElementName("set", "set", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGSetElement, +// CPPONLY: NS_NewSVGSetElement, TreeBuilder.OTHER); -public static final ElementName USE = new ElementName("use", "use", +public static final ElementName USE = new ElementName("use", "use", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUseElement, +// CPPONLY: NS_NewSVGUseElement, TreeBuilder.OTHER); -public static final ElementName VAR = new ElementName("var", "var", +public static final ElementName VAR = new ElementName("var", "var", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR); -public static final ElementName G = new ElementName("g", "g", +public static final ElementName G = new ElementName("g", "g", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGGElement, +// CPPONLY: NS_NewSVGGElement, TreeBuilder.OTHER); -public static final ElementName WBR = new ElementName("wbr", "wbr", +public static final ElementName WBR = new ElementName("wbr", "wbr", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.AREA_OR_WBR | SPECIAL); -public static final ElementName XMP = new ElementName("xmp", "xmp", +public static final ElementName XMP = new ElementName("xmp", "xmp", // CPPONLY: NS_NewHTMLPreElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.XMP | SPECIAL); -public static final ElementName I = new ElementName("i", "i", +public static final ElementName I = new ElementName("i", "i", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName P = new ElementName("p", "p", +public static final ElementName P = new ElementName("p", "p", // CPPONLY: NS_NewHTMLParagraphElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.P | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName Q = new ElementName("q", "q", +public static final ElementName Q = new ElementName("q", "q", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName S = new ElementName("s", "s", +public static final ElementName S = new ElementName("s", "s", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName U = new ElementName("u", "u", +public static final ElementName U = new ElementName("u", "u", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName H1 = new ElementName("h1", "h1", +public static final ElementName H1 = new ElementName("h1", "h1", // CPPONLY: NS_NewHTMLHeadingElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL); -public static final ElementName H2 = new ElementName("h2", "h2", +public static final ElementName H2 = new ElementName("h2", "h2", // CPPONLY: NS_NewHTMLHeadingElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL); -public static final ElementName H3 = new ElementName("h3", "h3", +public static final ElementName H3 = new ElementName("h3", "h3", // CPPONLY: NS_NewHTMLHeadingElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL); -public static final ElementName H4 = new ElementName("h4", "h4", +public static final ElementName H4 = new ElementName("h4", "h4", // CPPONLY: NS_NewHTMLHeadingElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL); -public static final ElementName H5 = new ElementName("h5", "h5", +public static final ElementName H5 = new ElementName("h5", "h5", // CPPONLY: NS_NewHTMLHeadingElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL); -public static final ElementName H6 = new ElementName("h6", "h6", +public static final ElementName H6 = new ElementName("h6", "h6", // CPPONLY: NS_NewHTMLHeadingElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL); -public static final ElementName AREA = new ElementName("area", "area", +public static final ElementName AREA = new ElementName("area", "area", // CPPONLY: NS_NewHTMLAreaElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.AREA_OR_WBR | SPECIAL); -public static final ElementName DATA = new ElementName("data", "data", +public static final ElementName DATA = new ElementName("data", "data", // CPPONLY: NS_NewHTMLDataElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName FEFUNCA = new ElementName("fefunca", "feFuncA", +public static final ElementName FEFUNCA = new ElementName("fefunca", "feFuncA", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEFuncAElement, +// CPPONLY: NS_NewSVGFEFuncAElement, TreeBuilder.OTHER); -public static final ElementName METADATA = new ElementName("metadata", "metadata", +public static final ElementName METADATA = new ElementName("metadata", "metadata", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGMetadataElement, +// CPPONLY: NS_NewSVGMetadataElement, TreeBuilder.OTHER); -public static final ElementName META = new ElementName("meta", "meta", +public static final ElementName META = new ElementName("meta", "meta", // CPPONLY: NS_NewHTMLMetaElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.META | SPECIAL); -public static final ElementName TEXTAREA = new ElementName("textarea", "textarea", +public static final ElementName TEXTAREA = new ElementName("textarea", "textarea", // CPPONLY: NS_NewHTMLTextAreaElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TEXTAREA | SPECIAL); -public static final ElementName FEFUNCB = new ElementName("fefuncb", "feFuncB", +public static final ElementName FEFUNCB = new ElementName("fefuncb", "feFuncB", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEFuncBElement, +// CPPONLY: NS_NewSVGFEFuncBElement, TreeBuilder.OTHER); -public static final ElementName RB = new ElementName("rb", "rb", +public static final ElementName RB = new ElementName("rb", "rb", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RB_OR_RTC | OPTIONAL_END_TAG); -public static final ElementName DESC = new ElementName("desc", "desc", +public static final ElementName DESC = new ElementName("desc", "desc", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGDescElement, +// CPPONLY: NS_NewSVGDescElement, TreeBuilder.FOREIGNOBJECT_OR_DESC | SCOPING_AS_SVG); -public static final ElementName DD = new ElementName("dd", "dd", +public static final ElementName DD = new ElementName("dd", "dd", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.DD_OR_DT | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName BGSOUND = new ElementName("bgsound", "bgsound", +public static final ElementName BGSOUND = new ElementName("bgsound", "bgsound", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL); -public static final ElementName EMBED = new ElementName("embed", "embed", +public static final ElementName EMBED = new ElementName("embed", "embed", // CPPONLY: NS_NewHTMLEmbedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.EMBED | SPECIAL); -public static final ElementName FEBLEND = new ElementName("feblend", "feBlend", +public static final ElementName FEBLEND = new ElementName("feblend", "feBlend", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEBlendElement, +// CPPONLY: NS_NewSVGFEBlendElement, TreeBuilder.OTHER); -public static final ElementName FEFLOOD = new ElementName("feflood", "feFlood", +public static final ElementName FEFLOOD = new ElementName("feflood", "feFlood", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEFloodElement, +// CPPONLY: NS_NewSVGFEFloodElement, TreeBuilder.OTHER); -public static final ElementName HEAD = new ElementName("head", "head", +public static final ElementName HEAD = new ElementName("head", "head", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.HEAD | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName LEGEND = new ElementName("legend", "legend", +public static final ElementName LEGEND = new ElementName("legend", "legend", // CPPONLY: NS_NewHTMLLegendElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName NOEMBED = new ElementName("noembed", "noembed", +public static final ElementName NOEMBED = new ElementName("noembed", "noembed", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.NOEMBED | SPECIAL); -public static final ElementName TD = new ElementName("td", "td", +public static final ElementName TD = new ElementName("td", "td", // CPPONLY: NS_NewHTMLTableCellElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TD_OR_TH | SPECIAL | SCOPING | OPTIONAL_END_TAG); -public static final ElementName THEAD = new ElementName("thead", "thead", +public static final ElementName THEAD = new ElementName("thead", "thead", // CPPONLY: NS_NewHTMLTableSectionElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); -public static final ElementName ASIDE = new ElementName("aside", "aside", +public static final ElementName ASIDE = new ElementName("aside", "aside", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName ARTICLE = new ElementName("article", "article", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName ARTICLE = new ElementName("article", "article", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName ANIMATE = new ElementName("animate", "animate", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName ANIMATE = new ElementName("animate", "animate", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGAnimateElement, +// CPPONLY: NS_NewSVGAnimateElement, TreeBuilder.OTHER); -public static final ElementName BASE = new ElementName("base", "base", +public static final ElementName BASE = new ElementName("base", "base", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.BASE | SPECIAL); -public static final ElementName BLOCKQUOTE = new ElementName("blockquote", "blockquote", +public static final ElementName BLOCKQUOTE = new ElementName("blockquote", "blockquote", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL); -public static final ElementName CODE = new ElementName("code", "code", +public static final ElementName CODE = new ElementName("code", "code", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName CIRCLE = new ElementName("circle", "circle", +public static final ElementName CIRCLE = new ElementName("circle", "circle", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGCircleElement, +// CPPONLY: NS_NewSVGCircleElement, TreeBuilder.OTHER); -public static final ElementName CITE = new ElementName("cite", "cite", +public static final ElementName CITE = new ElementName("cite", "cite", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName ELLIPSE = new ElementName("ellipse", "ellipse", +public static final ElementName ELLIPSE = new ElementName("ellipse", "ellipse", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGEllipseElement, +// CPPONLY: NS_NewSVGEllipseElement, TreeBuilder.OTHER); -public static final ElementName FETURBULENCE = new ElementName("feturbulence", "feTurbulence", +public static final ElementName FETURBULENCE = new ElementName("feturbulence", "feTurbulence", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFETurbulenceElement, +// CPPONLY: NS_NewSVGFETurbulenceElement, TreeBuilder.OTHER); -public static final ElementName FEMERGENODE = new ElementName("femergenode", "feMergeNode", +public static final ElementName FEMERGENODE = new ElementName("femergenode", "feMergeNode", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEMergeNodeElement, +// CPPONLY: NS_NewSVGFEMergeNodeElement, TreeBuilder.OTHER); -public static final ElementName FEIMAGE = new ElementName("feimage", "feImage", +public static final ElementName FEIMAGE = new ElementName("feimage", "feImage", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEImageElement, +// CPPONLY: NS_NewSVGFEImageElement, TreeBuilder.OTHER); -public static final ElementName FEMERGE = new ElementName("femerge", "feMerge", +public static final ElementName FEMERGE = new ElementName("femerge", "feMerge", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEMergeElement, +// CPPONLY: NS_NewSVGFEMergeElement, TreeBuilder.OTHER); -public static final ElementName FETILE = new ElementName("fetile", "feTile", +public static final ElementName FETILE = new ElementName("fetile", "feTile", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFETileElement, +// CPPONLY: NS_NewSVGFETileElement, TreeBuilder.OTHER); -public static final ElementName FRAME = new ElementName("frame", "frame", +public static final ElementName FRAME = new ElementName("frame", "frame", // CPPONLY: NS_NewHTMLFrameElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.FRAME | SPECIAL); -public static final ElementName FIGURE = new ElementName("figure", "figure", +public static final ElementName FIGURE = new ElementName("figure", "figure", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName FECOMPOSITE = new ElementName("fecomposite", "feComposite", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName FECOMPOSITE = new ElementName("fecomposite", "feComposite", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFECompositeElement, +// CPPONLY: NS_NewSVGFECompositeElement, TreeBuilder.OTHER); -public static final ElementName IMAGE = new ElementName("image", "image", +public static final ElementName IMAGE = new ElementName("image", "image", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGImageElement, +// CPPONLY: NS_NewSVGImageElement, TreeBuilder.IMAGE); -public static final ElementName IFRAME = new ElementName("iframe", "iframe", +public static final ElementName IFRAME = new ElementName("iframe", "iframe", // CPPONLY: NS_NewHTMLIFrameElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.IFRAME | SPECIAL); -public static final ElementName LINE = new ElementName("line", "line", +public static final ElementName LINE = new ElementName("line", "line", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGLineElement, +// CPPONLY: NS_NewSVGLineElement, TreeBuilder.OTHER); -public static final ElementName MARQUEE = new ElementName("marquee", "marquee", +public static final ElementName MARQUEE = new ElementName("marquee", "marquee", // CPPONLY: NS_NewHTMLMarqueeElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MARQUEE_OR_APPLET | SPECIAL | SCOPING); -public static final ElementName POLYLINE = new ElementName("polyline", "polyline", +public static final ElementName POLYLINE = new ElementName("polyline", "polyline", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGPolylineElement, +// CPPONLY: NS_NewSVGPolylineElement, TreeBuilder.OTHER); -public static final ElementName PICTURE = new ElementName("picture", "picture", +public static final ElementName PICTURE = new ElementName("picture", "picture", // CPPONLY: NS_NewHTMLPictureElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName SOURCE = new ElementName("source", "source", +public static final ElementName SOURCE = new ElementName("source", "source", // CPPONLY: NS_NewHTMLSourceElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.PARAM_OR_SOURCE_OR_TRACK); -public static final ElementName STRIKE = new ElementName("strike", "strike", +public static final ElementName STRIKE = new ElementName("strike", "strike", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName STYLE = new ElementName("style", "style", +public static final ElementName STYLE = new ElementName("style", "style", // CPPONLY: NS_NewHTMLStyleElement, -// CPPONLY: NS_NewSVGStyleElement, +// CPPONLY: NS_NewSVGStyleElement, TreeBuilder.STYLE | SPECIAL); -public static final ElementName TABLE = new ElementName("table", "table", +public static final ElementName TABLE = new ElementName("table", "table", // CPPONLY: NS_NewHTMLTableElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TABLE | SPECIAL | FOSTER_PARENTING | SCOPING); -public static final ElementName TITLE = new ElementName("title", "title", +public static final ElementName TITLE = new ElementName("title", "title", // CPPONLY: NS_NewHTMLTitleElement, -// CPPONLY: NS_NewSVGTitleElement, +// CPPONLY: NS_NewSVGTitleElement, TreeBuilder.TITLE | SPECIAL | SCOPING_AS_SVG); -public static final ElementName TIME = new ElementName("time", "time", +public static final ElementName TIME = new ElementName("time", "time", // CPPONLY: NS_NewHTMLTimeElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName TEMPLATE = new ElementName("template", "template", +public static final ElementName TEMPLATE = new ElementName("template", "template", // CPPONLY: NS_NewHTMLTemplateElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TEMPLATE | SPECIAL | SCOPING); -public static final ElementName ALTGLYPHDEF = new ElementName("altglyphdef", "altGlyphDef", +public static final ElementName ALTGLYPHDEF = new ElementName("altglyphdef", "altGlyphDef", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName GLYPHREF = new ElementName("glyphref", "glyphRef", +public static final ElementName GLYPHREF = new ElementName("glyphref", "glyphRef", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName DIALOG = new ElementName("dialog", "dialog", +public static final ElementName DIALOG = new ElementName("dialog", "dialog", // CPPONLY: NS_NewHTMLDialogElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName FEFUNCG = new ElementName("fefuncg", "feFuncG", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName FEFUNCG = new ElementName("fefuncg", "feFuncG", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEFuncGElement, +// CPPONLY: NS_NewSVGFEFuncGElement, TreeBuilder.OTHER); -public static final ElementName FEDIFFUSELIGHTING = new ElementName("fediffuselighting", "feDiffuseLighting", +public static final ElementName FEDIFFUSELIGHTING = new ElementName("fediffuselighting", "feDiffuseLighting", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEDiffuseLightingElement, +// CPPONLY: NS_NewSVGFEDiffuseLightingElement, TreeBuilder.OTHER); -public static final ElementName FESPECULARLIGHTING = new ElementName("fespecularlighting", "feSpecularLighting", +public static final ElementName FESPECULARLIGHTING = new ElementName("fespecularlighting", "feSpecularLighting", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFESpecularLightingElement, +// CPPONLY: NS_NewSVGFESpecularLightingElement, TreeBuilder.OTHER); -public static final ElementName LISTING = new ElementName("listing", "listing", +public static final ElementName LISTING = new ElementName("listing", "listing", // CPPONLY: NS_NewHTMLPreElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.PRE_OR_LISTING | SPECIAL); -public static final ElementName STRONG = new ElementName("strong", "strong", +public static final ElementName STRONG = new ElementName("strong", "strong", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName ALTGLYPH = new ElementName("altglyph", "altGlyph", +public static final ElementName ALTGLYPH = new ElementName("altglyph", "altGlyph", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName CLIPPATH = new ElementName("clippath", "clipPath", +public static final ElementName CLIPPATH = new ElementName("clippath", "clipPath", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGClipPathElement, +// CPPONLY: NS_NewSVGClipPathElement, TreeBuilder.OTHER); -public static final ElementName MGLYPH = new ElementName("mglyph", "mglyph", +public static final ElementName MGLYPH = new ElementName("mglyph", "mglyph", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MGLYPH_OR_MALIGNMARK); -public static final ElementName MATH = new ElementName("math", "math", +public static final ElementName MATH = new ElementName("math", "math", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MATH); -public static final ElementName MPATH = new ElementName("mpath", "mpath", +public static final ElementName MPATH = new ElementName("mpath", "mpath", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGMPathElement, +// CPPONLY: NS_NewSVGMPathElement, TreeBuilder.OTHER); -public static final ElementName PATH = new ElementName("path", "path", +public static final ElementName PATH = new ElementName("path", "path", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGPathElement, +// CPPONLY: NS_NewSVGPathElement, TreeBuilder.OTHER); -public static final ElementName TH = new ElementName("th", "th", +public static final ElementName TH = new ElementName("th", "th", // CPPONLY: NS_NewHTMLTableCellElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TD_OR_TH | SPECIAL | SCOPING | OPTIONAL_END_TAG); -public static final ElementName SEARCH = new ElementName("search", "search", -// CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName SWITCH = new ElementName("switch", "switch", +public static final ElementName SWITCH = new ElementName("switch", "switch", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGSwitchElement, +// CPPONLY: NS_NewSVGSwitchElement, TreeBuilder.OTHER); -public static final ElementName TEXTPATH = new ElementName("textpath", "textPath", +public static final ElementName TEXTPATH = new ElementName("textpath", "textPath", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGTextPathElement, +// CPPONLY: NS_NewSVGTextPathElement, TreeBuilder.OTHER); -public static final ElementName LI = new ElementName("li", "li", +public static final ElementName LI = new ElementName("li", "li", // CPPONLY: NS_NewHTMLLIElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.LI | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName MI = new ElementName("mi", "mi", +public static final ElementName MI = new ElementName("mi", "mi", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MI_MO_MN_MS_MTEXT | SCOPING_AS_MATHML); -public static final ElementName LINK = new ElementName("link", "link", +public static final ElementName LINK = new ElementName("link", "link", // CPPONLY: NS_NewHTMLLinkElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL); -public static final ElementName MARK = new ElementName("mark", "mark", +public static final ElementName MARK = new ElementName("mark", "mark", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName MALIGNMARK = new ElementName("malignmark", "malignmark", +public static final ElementName MALIGNMARK = new ElementName("malignmark", "malignmark", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MGLYPH_OR_MALIGNMARK); -public static final ElementName MASK = new ElementName("mask", "mask", +public static final ElementName MASK = new ElementName("mask", "mask", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGMaskElement, +// CPPONLY: NS_NewSVGMaskElement, TreeBuilder.OTHER); -public static final ElementName TRACK = new ElementName("track", "track", +public static final ElementName TRACK = new ElementName("track", "track", // CPPONLY: NS_NewHTMLTrackElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.PARAM_OR_SOURCE_OR_TRACK | SPECIAL); -public static final ElementName DL = new ElementName("dl", "dl", +public static final ElementName DL = new ElementName("dl", "dl", // CPPONLY: NS_NewHTMLSharedListElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.UL_OR_OL_OR_DL | SPECIAL); -public static final ElementName HTML = new ElementName("html", "html", +public static final ElementName HTML = new ElementName("html", "html", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.HTML | SPECIAL | SCOPING | OPTIONAL_END_TAG); -public static final ElementName OL = new ElementName("ol", "ol", +public static final ElementName OL = new ElementName("ol", "ol", // CPPONLY: NS_NewHTMLSharedListElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.UL_OR_OL_OR_DL | SPECIAL); -public static final ElementName LABEL = new ElementName("label", "label", +public static final ElementName LABEL = new ElementName("label", "label", // CPPONLY: NS_NewHTMLLabelElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName UL = new ElementName("ul", "ul", +public static final ElementName UL = new ElementName("ul", "ul", // CPPONLY: NS_NewHTMLSharedListElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.UL_OR_OL_OR_DL | SPECIAL); -public static final ElementName SMALL = new ElementName("small", "small", +public static final ElementName SMALL = new ElementName("small", "small", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName SYMBOL = new ElementName("symbol", "symbol", +public static final ElementName SYMBOL = new ElementName("symbol", "symbol", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGSymbolElement, +// CPPONLY: NS_NewSVGSymbolElement, TreeBuilder.OTHER); -public static final ElementName ALTGLYPHITEM = new ElementName("altglyphitem", "altGlyphItem", +public static final ElementName ALTGLYPHITEM = new ElementName("altglyphitem", "altGlyphItem", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName ANIMATETRANSFORM = new ElementName("animatetransform", "animateTransform", +public static final ElementName ANIMATETRANSFORM = new ElementName("animatetransform", "animateTransform", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGAnimateTransformElement, +// CPPONLY: NS_NewSVGAnimateTransformElement, TreeBuilder.OTHER); -public static final ElementName ACRONYM = new ElementName("acronym", "acronym", +public static final ElementName ACRONYM = new ElementName("acronym", "acronym", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName EM = new ElementName("em", "em", +public static final ElementName EM = new ElementName("em", "em", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName FORM = new ElementName("form", "form", +public static final ElementName FORM = new ElementName("form", "form", // CPPONLY: NS_NewHTMLFormElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.FORM | SPECIAL); -public static final ElementName PARAM = new ElementName("param", "param", +public static final ElementName PARAM = new ElementName("param", "param", // CPPONLY: NS_NewHTMLSharedElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.PARAM_OR_SOURCE_OR_TRACK | SPECIAL); -public static final ElementName ANIMATEMOTION = new ElementName("animatemotion", "animateMotion", +public static final ElementName ANIMATEMOTION = new ElementName("animatemotion", "animateMotion", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGAnimateMotionElement, +// CPPONLY: NS_NewSVGAnimateMotionElement, TreeBuilder.OTHER); -public static final ElementName BUTTON = new ElementName("button", "button", +public static final ElementName BUTTON = new ElementName("button", "button", // CPPONLY: NS_NewHTMLButtonElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.BUTTON | SPECIAL); -public static final ElementName CAPTION = new ElementName("caption", "caption", +public static final ElementName CAPTION = new ElementName("caption", "caption", // CPPONLY: NS_NewHTMLTableCaptionElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.CAPTION | SPECIAL | SCOPING); -public static final ElementName FIGCAPTION = new ElementName("figcaption", "figcaption", +public static final ElementName FIGCAPTION = new ElementName("figcaption", "figcaption", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName MN = new ElementName("mn", "mn", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName MN = new ElementName("mn", "mn", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MI_MO_MN_MS_MTEXT | SCOPING_AS_MATHML); -public static final ElementName KEYGEN = new ElementName("keygen", "keygen", +public static final ElementName KEYGEN = new ElementName("keygen", "keygen", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.KEYGEN | SPECIAL); -public static final ElementName MAIN = new ElementName("main", "main", +public static final ElementName MAIN = new ElementName("main", "main", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName OPTION = new ElementName("option", "option", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName OPTION = new ElementName("option", "option", // CPPONLY: NS_NewHTMLOptionElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OPTION | OPTIONAL_END_TAG); -public static final ElementName POLYGON = new ElementName("polygon", "polygon", +public static final ElementName POLYGON = new ElementName("polygon", "polygon", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGPolygonElement, +// CPPONLY: NS_NewSVGPolygonElement, TreeBuilder.OTHER); -public static final ElementName PATTERN = new ElementName("pattern", "pattern", +public static final ElementName PATTERN = new ElementName("pattern", "pattern", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGPatternElement, +// CPPONLY: NS_NewSVGPatternElement, TreeBuilder.OTHER); -public static final ElementName SPAN = new ElementName("span", "span", +public static final ElementName SPAN = new ElementName("span", "span", // CPPONLY: NS_NewHTMLSpanElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR); -public static final ElementName SECTION = new ElementName("section", "section", +public static final ElementName SECTION = new ElementName("section", "section", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName TSPAN = new ElementName("tspan", "tspan", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName TSPAN = new ElementName("tspan", "tspan", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGTSpanElement, +// CPPONLY: NS_NewSVGTSpanElement, TreeBuilder.OTHER); -public static final ElementName AUDIO = new ElementName("audio", "audio", +public static final ElementName AUDIO = new ElementName("audio", "audio", // CPPONLY: NS_NewHTMLAudioElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName MO = new ElementName("mo", "mo", +public static final ElementName MO = new ElementName("mo", "mo", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MI_MO_MN_MS_MTEXT | SCOPING_AS_MATHML); -public static final ElementName VIDEO = new ElementName("video", "video", +public static final ElementName VIDEO = new ElementName("video", "video", // CPPONLY: NS_NewHTMLVideoElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName COLGROUP = new ElementName("colgroup", "colgroup", +public static final ElementName COLGROUP = new ElementName("colgroup", "colgroup", // CPPONLY: NS_NewHTMLTableColElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.COLGROUP | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName FEDISPLACEMENTMAP = new ElementName("fedisplacementmap", "feDisplacementMap", +public static final ElementName FEDISPLACEMENTMAP = new ElementName("fedisplacementmap", "feDisplacementMap", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEDisplacementMapElement, +// CPPONLY: NS_NewSVGFEDisplacementMapElement, TreeBuilder.OTHER); -public static final ElementName HGROUP = new ElementName("hgroup", "hgroup", +public static final ElementName HGROUP = new ElementName("hgroup", "hgroup", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName RP = new ElementName("rp", "rp", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName RP = new ElementName("rp", "rp", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RT_OR_RP | OPTIONAL_END_TAG); -public static final ElementName OPTGROUP = new ElementName("optgroup", "optgroup", +public static final ElementName OPTGROUP = new ElementName("optgroup", "optgroup", // CPPONLY: NS_NewHTMLOptGroupElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OPTGROUP | OPTIONAL_END_TAG); -public static final ElementName SAMP = new ElementName("samp", "samp", +public static final ElementName SAMP = new ElementName("samp", "samp", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName STOP = new ElementName("stop", "stop", +public static final ElementName STOP = new ElementName("stop", "stop", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGStopElement, +// CPPONLY: NS_NewSVGStopElement, TreeBuilder.OTHER); -public static final ElementName BR = new ElementName("br", "br", +public static final ElementName BR = new ElementName("br", "br", // CPPONLY: NS_NewHTMLBRElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.BR | SPECIAL); -public static final ElementName ABBR = new ElementName("abbr", "abbr", +public static final ElementName ABBR = new ElementName("abbr", "abbr", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName ANIMATECOLOR = new ElementName("animatecolor", "animateColor", +public static final ElementName ANIMATECOLOR = new ElementName("animatecolor", "animateColor", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName CENTER = new ElementName("center", "center", +public static final ElementName CENTER = new ElementName("center", "center", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL); -public static final ElementName HR = new ElementName("hr", "hr", +public static final ElementName HR = new ElementName("hr", "hr", // CPPONLY: NS_NewHTMLHRElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.HR | SPECIAL); -public static final ElementName FEFUNCR = new ElementName("fefuncr", "feFuncR", +public static final ElementName FEFUNCR = new ElementName("fefuncr", "feFuncR", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEFuncRElement, +// CPPONLY: NS_NewSVGFEFuncRElement, TreeBuilder.OTHER); -public static final ElementName FECOMPONENTTRANSFER = new ElementName("fecomponenttransfer", "feComponentTransfer", +public static final ElementName FECOMPONENTTRANSFER = new ElementName("fecomponenttransfer", "feComponentTransfer", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEComponentTransferElement, +// CPPONLY: NS_NewSVGFEComponentTransferElement, TreeBuilder.OTHER); -public static final ElementName FILTER = new ElementName("filter", "filter", +public static final ElementName FILTER = new ElementName("filter", "filter", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFilterElement, +// CPPONLY: NS_NewSVGFilterElement, TreeBuilder.OTHER); -public static final ElementName FOOTER = new ElementName("footer", "footer", +public static final ElementName FOOTER = new ElementName("footer", "footer", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName FEGAUSSIANBLUR = new ElementName("fegaussianblur", "feGaussianBlur", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName FEGAUSSIANBLUR = new ElementName("fegaussianblur", "feGaussianBlur", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEGaussianBlurElement, +// CPPONLY: NS_NewSVGFEGaussianBlurElement, TreeBuilder.OTHER); -public static final ElementName HEADER = new ElementName("header", "header", +public static final ElementName HEADER = new ElementName("header", "header", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName MARKER = new ElementName("marker", "marker", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName MARKER = new ElementName("marker", "marker", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGMarkerElement, +// CPPONLY: NS_NewSVGMarkerElement, TreeBuilder.OTHER); -public static final ElementName METER = new ElementName("meter", "meter", +public static final ElementName METER = new ElementName("meter", "meter", // CPPONLY: NS_NewHTMLMeterElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName NOBR = new ElementName("nobr", "nobr", +public static final ElementName NOBR = new ElementName("nobr", "nobr", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.NOBR); -public static final ElementName TR = new ElementName("tr", "tr", +public static final ElementName TR = new ElementName("tr", "tr", // CPPONLY: NS_NewHTMLTableRowElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TR | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); -public static final ElementName ADDRESS = new ElementName("address", "address", +public static final ElementName ADDRESS = new ElementName("address", "address", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName CANVAS = new ElementName("canvas", "canvas", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName CANVAS = new ElementName("canvas", "canvas", // CPPONLY: NS_NewHTMLCanvasElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName DEFS = new ElementName("defs", "defs", +public static final ElementName DEFS = new ElementName("defs", "defs", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGDefsElement, +// CPPONLY: NS_NewSVGDefsElement, TreeBuilder.OTHER); -public static final ElementName DETAILS = new ElementName("details", "details", +public static final ElementName DETAILS = new ElementName("details", "details", // CPPONLY: NS_NewHTMLDetailsElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName MS = new ElementName("ms", "ms", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName MS = new ElementName("ms", "ms", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MI_MO_MN_MS_MTEXT | SCOPING_AS_MATHML); -public static final ElementName NOFRAMES = new ElementName("noframes", "noframes", +public static final ElementName NOFRAMES = new ElementName("noframes", "noframes", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.NOFRAMES | SPECIAL); -public static final ElementName PROGRESS = new ElementName("progress", "progress", +public static final ElementName PROGRESS = new ElementName("progress", "progress", // CPPONLY: NS_NewHTMLProgressElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName DT = new ElementName("dt", "dt", +public static final ElementName DT = new ElementName("dt", "dt", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.DD_OR_DT | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName APPLET = new ElementName("applet", "applet", +public static final ElementName APPLET = new ElementName("applet", "applet", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MARQUEE_OR_APPLET | SPECIAL | SCOPING); -public static final ElementName BASEFONT = new ElementName("basefont", "basefont", +public static final ElementName BASEFONT = new ElementName("basefont", "basefont", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL); -public static final ElementName DATALIST = new ElementName("datalist", "datalist", +public static final ElementName DATALIST = new ElementName("datalist", "datalist", // CPPONLY: NS_NewHTMLDataListElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName FOREIGNOBJECT = new ElementName("foreignobject", "foreignObject", +public static final ElementName FOREIGNOBJECT = new ElementName("foreignobject", "foreignObject", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGForeignObjectElement, +// CPPONLY: NS_NewSVGForeignObjectElement, TreeBuilder.FOREIGNOBJECT_OR_DESC | SCOPING_AS_SVG); -public static final ElementName FIELDSET = new ElementName("fieldset", "fieldset", +public static final ElementName FIELDSET = new ElementName("fieldset", "fieldset", // CPPONLY: NS_NewHTMLFieldSetElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.FIELDSET | SPECIAL); -public static final ElementName FRAMESET = new ElementName("frameset", "frameset", +public static final ElementName FRAMESET = new ElementName("frameset", "frameset", // CPPONLY: NS_NewHTMLFrameSetElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.FRAMESET | SPECIAL); -public static final ElementName FEOFFSET = new ElementName("feoffset", "feOffset", +public static final ElementName FEOFFSET = new ElementName("feoffset", "feOffset", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEOffsetElement, +// CPPONLY: NS_NewSVGFEOffsetElement, TreeBuilder.OTHER); -public static final ElementName FESPOTLIGHT = new ElementName("fespotlight", "feSpotLight", +public static final ElementName FESPOTLIGHT = new ElementName("fespotlight", "feSpotLight", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFESpotLightElement, +// CPPONLY: NS_NewSVGFESpotLightElement, TreeBuilder.OTHER); -public static final ElementName FEPOINTLIGHT = new ElementName("fepointlight", "fePointLight", +public static final ElementName FEPOINTLIGHT = new ElementName("fepointlight", "fePointLight", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEPointLightElement, +// CPPONLY: NS_NewSVGFEPointLightElement, TreeBuilder.OTHER); -public static final ElementName FEDISTANTLIGHT = new ElementName("fedistantlight", "feDistantLight", +public static final ElementName FEDISTANTLIGHT = new ElementName("fedistantlight", "feDistantLight", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEDistantLightElement, +// CPPONLY: NS_NewSVGFEDistantLightElement, TreeBuilder.OTHER); -public static final ElementName FONT = new ElementName("font", "font", +public static final ElementName FONT = new ElementName("font", "font", // CPPONLY: NS_NewHTMLFontElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.FONT); -public static final ElementName INPUT = new ElementName("input", "input", +public static final ElementName INPUT = new ElementName("input", "input", // CPPONLY: NS_NewHTMLInputElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.INPUT | SPECIAL); -public static final ElementName LINEARGRADIENT = new ElementName("lineargradient", "linearGradient", +public static final ElementName LINEARGRADIENT = new ElementName("lineargradient", "linearGradient", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGLinearGradientElement, +// CPPONLY: NS_NewSVGLinearGradientElement, TreeBuilder.OTHER); -public static final ElementName MTEXT = new ElementName("mtext", "mtext", +public static final ElementName MTEXT = new ElementName("mtext", "mtext", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.MI_MO_MN_MS_MTEXT | SCOPING_AS_MATHML); -public static final ElementName NOSCRIPT = new ElementName("noscript", "noscript", +public static final ElementName NOSCRIPT = new ElementName("noscript", "noscript", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.NOSCRIPT | SPECIAL); -public static final ElementName RT = new ElementName("rt", "rt", +public static final ElementName RT = new ElementName("rt", "rt", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RT_OR_RP | OPTIONAL_END_TAG); -public static final ElementName OBJECT = new ElementName("object", "object", +public static final ElementName OBJECT = new ElementName("object", "object", // CPPONLY: NS_NewHTMLObjectElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OBJECT | SPECIAL | SCOPING); -public static final ElementName OUTPUT = new ElementName("output", "output", +public static final ElementName OUTPUT = new ElementName("output", "output", // CPPONLY: NS_NewHTMLOutputElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OUTPUT); -public static final ElementName PLAINTEXT = new ElementName("plaintext", "plaintext", +public static final ElementName PLAINTEXT = new ElementName("plaintext", "plaintext", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.PLAINTEXT | SPECIAL); -public static final ElementName TT = new ElementName("tt", "tt", +public static final ElementName TT = new ElementName("tt", "tt", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U); -public static final ElementName RECT = new ElementName("rect", "rect", +public static final ElementName RECT = new ElementName("rect", "rect", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGRectElement, +// CPPONLY: NS_NewSVGRectElement, TreeBuilder.OTHER); -public static final ElementName RADIALGRADIENT = new ElementName("radialgradient", "radialGradient", +public static final ElementName RADIALGRADIENT = new ElementName("radialgradient", "radialGradient", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGRadialGradientElement, +// CPPONLY: NS_NewSVGRadialGradientElement, TreeBuilder.OTHER); -public static final ElementName SELECT = new ElementName("select", "select", +public static final ElementName SELECT = new ElementName("select", "select", // CPPONLY: NS_NewHTMLSelectElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.SELECT | SPECIAL); -public static final ElementName SLOT = new ElementName("slot", "slot", +public static final ElementName SLOT = new ElementName("slot", "slot", // CPPONLY: NS_NewHTMLSlotElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); -public static final ElementName SCRIPT = new ElementName("script", "script", +public static final ElementName SCRIPT = new ElementName("script", "script", // CPPONLY: NS_NewHTMLScriptElement, -// CPPONLY: NS_NewSVGScriptElement, +// CPPONLY: NS_NewSVGScriptElement, TreeBuilder.SCRIPT | SPECIAL); -public static final ElementName TFOOT = new ElementName("tfoot", "tfoot", +public static final ElementName TFOOT = new ElementName("tfoot", "tfoot", // CPPONLY: NS_NewHTMLTableSectionElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); -public static final ElementName TEXT = new ElementName("text", "text", +public static final ElementName TEXT = new ElementName("text", "text", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGTextElement, +// CPPONLY: NS_NewSVGTextElement, TreeBuilder.OTHER); -public static final ElementName MENU = new ElementName("menu", "menu", +public static final ElementName MENU = new ElementName("menu", "menu", // CPPONLY: NS_NewHTMLMenuElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL); -public static final ElementName FEDROPSHADOW = new ElementName("fedropshadow", "feDropShadow", +public static final ElementName FEDROPSHADOW = new ElementName("fedropshadow", "feDropShadow", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEDropShadowElement, +// CPPONLY: NS_NewSVGFEDropShadowElement, TreeBuilder.OTHER); -public static final ElementName VIEW = new ElementName("view", "view", +public static final ElementName VIEW = new ElementName("view", "view", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGViewElement, +// CPPONLY: NS_NewSVGViewElement, TreeBuilder.OTHER); -public static final ElementName FECOLORMATRIX = new ElementName("fecolormatrix", "feColorMatrix", +public static final ElementName FECOLORMATRIX = new ElementName("fecolormatrix", "feColorMatrix", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEColorMatrixElement, +// CPPONLY: NS_NewSVGFEColorMatrixElement, TreeBuilder.OTHER); -public static final ElementName FECONVOLVEMATRIX = new ElementName("feconvolvematrix", "feConvolveMatrix", +public static final ElementName FECONVOLVEMATRIX = new ElementName("feconvolvematrix", "feConvolveMatrix", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEConvolveMatrixElement, +// CPPONLY: NS_NewSVGFEConvolveMatrixElement, TreeBuilder.OTHER); -public static final ElementName BODY = new ElementName("body", "body", +public static final ElementName BODY = new ElementName("body", "body", // CPPONLY: NS_NewHTMLBodyElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.BODY | SPECIAL | OPTIONAL_END_TAG); -public static final ElementName FEMORPHOLOGY = new ElementName("femorphology", "feMorphology", +public static final ElementName FEMORPHOLOGY = new ElementName("femorphology", "feMorphology", // CPPONLY: NS_NewHTMLUnknownElement, -// CPPONLY: NS_NewSVGFEMorphologyElement, +// CPPONLY: NS_NewSVGFEMorphologyElement, TreeBuilder.OTHER); -public static final ElementName RUBY = new ElementName("ruby", "ruby", +public static final ElementName RUBY = new ElementName("ruby", "ruby", // CPPONLY: NS_NewHTMLElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR); -public static final ElementName SUMMARY = new ElementName("summary", "summary", +public static final ElementName SUMMARY = new ElementName("summary", "summary", // CPPONLY: NS_NewHTMLSummaryElement, -// CPPONLY: NS_NewSVGUnknownElement, -TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SEARCH_OR_SECTION_OR_SUMMARY | SPECIAL); -public static final ElementName TBODY = new ElementName("tbody", "tbody", +// CPPONLY: NS_NewSVGUnknownElement, +TreeBuilder.ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY | SPECIAL); +public static final ElementName TBODY = new ElementName("tbody", "tbody", // CPPONLY: NS_NewHTMLTableSectionElement, -// CPPONLY: NS_NewSVGUnknownElement, +// CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); private final static @NoLength ElementName[] ELEMENT_NAMES = { -FIGCAPTION, +MN, CITE, FRAMESET, H1, @@ -1492,8 +1488,8 @@ RADIALGRADIENT, B, BGSOUND, SOURCE, -DL, -RP, +HTML, +OPTGROUP, NOFRAMES, MTEXT, VIEW, @@ -1503,10 +1499,10 @@ FEFUNCA, THEAD, FIGURE, GLYPHREF, -TEXTPATH, -ANIMATETRANSFORM, -SECTION, -HR, +LI, +ACRONYM, +TSPAN, +FEFUNCR, CANVAS, BASEFONT, FEDISTANTLIGHT, @@ -1526,13 +1522,13 @@ LINE, TITLE, FESPECULARLIGHTING, PATH, -MARK, -UL, -PARAM, -OPTION, -VIDEO, -BR, -FOOTER, +MALIGNMARK, +SMALL, +ANIMATEMOTION, +POLYGON, +COLGROUP, +ABBR, +FEGAUSSIANBLUR, TR, DETAILS, DT, @@ -1570,21 +1566,21 @@ TEMPLATE, FEFUNCG, STRONG, MATH, -SEARCH, -MI, -MASK, -OL, -SYMBOL, -EM, -BUTTON, -KEYGEN, -PATTERN, -AUDIO, -FEDISPLACEMENTMAP, -SAMP, -ANIMATECOLOR, -FECOMPONENTTRANSFER, -HEADER, +SWITCH, +LINK, +TRACK, +LABEL, +ALTGLYPHITEM, +FORM, +CAPTION, +MAIN, +SPAN, +MO, +HGROUP, +STOP, +CENTER, +FILTER, +MARKER, NOBR, ADDRESS, DEFS, @@ -1660,38 +1656,37 @@ ALTGLYPH, MGLYPH, MPATH, TH, -SWITCH, -LI, -LINK, -MALIGNMARK, -TRACK, -HTML, -LABEL, -SMALL, -ALTGLYPHITEM, -ACRONYM, -FORM, -ANIMATEMOTION, -CAPTION, -MN, -MAIN, -POLYGON, -SPAN, -TSPAN, -MO, -COLGROUP, -HGROUP, -OPTGROUP, -STOP, -ABBR, -CENTER, -FEFUNCR, -FILTER, -FEGAUSSIANBLUR, -MARKER, +TEXTPATH, +MI, +MARK, +MASK, +DL, +OL, +UL, +SYMBOL, +ANIMATETRANSFORM, +EM, +PARAM, +BUTTON, +FIGCAPTION, +KEYGEN, +OPTION, +PATTERN, +SECTION, +AUDIO, +VIDEO, +FEDISPLACEMENTMAP, +RP, +SAMP, +BR, +ANIMATECOLOR, +HR, +FECOMPONENTTRANSFER, +FOOTER, +HEADER, }; private final static int[] ELEMENT_HASHES = { -1900845386, +1902641154, 1748359220, 2001349720, 876609538, @@ -1701,8 +1696,8 @@ private final static int[] ELEMENT_HASHES = { 59768833, 1730965751, 1756474198, -1864368130, -1938817026, +1868312196, +1939219752, 1988763672, 2005324101, 2060065124, @@ -1712,10 +1707,10 @@ private final static int[] ELEMENT_HASHES = { 1740181637, 1749905526, 1766992520, -1807599880, -1881498736, -1907661127, -1967128578, +1818230786, +1881613047, +1907959605, +1967760215, 1982935782, 1999397992, 2001392798, @@ -1735,13 +1730,13 @@ private final static int[] ELEMENT_HASHES = { 1757146773, 1783388498, 1805502724, -1854228692, -1873281026, -1889085973, -1905563974, -1925844629, -1963982850, -1967795958, +1854228698, +1874053333, +1898223949, +1906087319, +1932928296, +1965115924, +1968053806, 1973420034, 1983633431, 1998585858, @@ -1779,21 +1774,21 @@ private final static int[] ELEMENT_HASHES = { 1783210839, 1790207270, 1803929812, -1806805526, -1818755074, -1854245076, -1870135298, -1874102998, -1881669634, -1898753862, -1903302038, -1906135367, -1914900309, -1934172497, -1941178676, -1965334268, -1967788867, -1968836118, +1806806678, +1853642948, +1857653029, +1870268949, +1881288348, +1884120164, +1899272519, +1904412884, +1907435316, +1919418370, +1935549734, +1941221172, +1966223078, +1967795910, +1971461414, 1971938532, 1982173479, 1983533124, @@ -1869,34 +1864,33 @@ private final static int[] ELEMENT_HASHES = { 1803876550, 1803929861, 1805647874, -1806806678, -1818230786, -1853642948, -1854228698, -1857653029, -1868312196, -1870268949, -1874053333, -1881288348, -1881613047, -1884120164, -1898223949, -1899272519, -1902641154, -1904412884, -1906087319, -1907435316, -1907959605, -1919418370, -1932928296, -1935549734, -1939219752, -1941221172, -1965115924, -1966223078, -1967760215, -1967795910, -1968053806, -1971461414, +1807599880, +1818755074, +1854228692, +1854245076, +1864368130, +1870135298, +1873281026, +1874102998, +1881498736, +1881669634, +1889085973, +1898753862, +1900845386, +1903302038, +1905563974, +1906135367, +1907661127, +1914900309, +1925844629, +1934172497, +1938817026, +1941178676, +1963982850, +1965334268, +1967128578, +1967788867, +1967795958, +1968836118, }; } diff --git a/parser/html/javasrc/Tokenizer.java b/parser/html/javasrc/Tokenizer.java index 3f8a89d16b90..a673a1a1b5da 100644 --- a/parser/html/javasrc/Tokenizer.java +++ b/parser/html/javasrc/Tokenizer.java @@ -697,15 +697,6 @@ public class Tokenizer implements Locator, Locator2 { return null; } - /** - * Gets the errorProfile. - * - * @param errorProfile - */ - public HashMap getErrorProfile() { - return null; - } - /** * Sets the commentPolicy. * diff --git a/parser/html/javasrc/TreeBuilder.java b/parser/html/javasrc/TreeBuilder.java index d7855a75c3c7..b6438326b88b 100644 --- a/parser/html/javasrc/TreeBuilder.java +++ b/parser/html/javasrc/TreeBuilder.java @@ -168,7 +168,7 @@ public abstract class TreeBuilder implements TokenHandler, final static int DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU = 50; - final static int 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_SEARCH_OR_SECTION_OR_SUMMARY = 51; + final static int 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 = 51; final static int RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR = 52; @@ -1949,7 +1949,7 @@ public abstract class TreeBuilder implements TokenHandler, case P: case DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU: case UL_OR_OL_OR_DL: - case 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_SEARCH_OR_SECTION_OR_SUMMARY: + case 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: implicitlyCloseP(); appendToCurrentNodeAndPushElementMayFoster( elementName, @@ -3460,7 +3460,7 @@ public abstract class TreeBuilder implements TokenHandler, case PRE_OR_LISTING: case FIELDSET: case BUTTON: - case 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_SEARCH_OR_SECTION_OR_SUMMARY: + case 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: eltPos = findLastInScope(name); if (eltPos == TreeBuilder.NOT_FOUND_ON_STACK) { errStrayEndTag(name); diff --git a/parser/html/nsHtml5ElementName.cpp b/parser/html/nsHtml5ElementName.cpp index 9b3fad8d35af..93a6407d387c 100644 --- a/parser/html/nsHtml5ElementName.cpp +++ b/parser/html/nsHtml5ElementName.cpp @@ -180,7 +180,6 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_MATH = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_MPATH = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_PATH = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_TH = nullptr; -nsHtml5ElementName* nsHtml5ElementName::ELT_SEARCH = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_SWITCH = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_TEXTPATH = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_LI = nullptr; @@ -288,24 +287,24 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_SUMMARY = nullptr; nsHtml5ElementName* nsHtml5ElementName::ELT_TBODY = nullptr; nsHtml5ElementName** nsHtml5ElementName::ELEMENT_NAMES = 0; static int32_t const ELEMENT_HASHES_DATA[] = { - 1900845386, 1748359220, 2001349720, 876609538, 1798686984, 1971465813, - 2007781534, 59768833, 1730965751, 1756474198, 1864368130, 1938817026, + 1902641154, 1748359220, 2001349720, 876609538, 1798686984, 1971465813, + 2007781534, 59768833, 1730965751, 1756474198, 1868312196, 1939219752, 1988763672, 2005324101, 2060065124, 52490899, 62390273, 1682547543, - 1740181637, 1749905526, 1766992520, 1807599880, 1881498736, 1907661127, - 1967128578, 1982935782, 1999397992, 2001392798, 2006329158, 2008851557, + 1740181637, 1749905526, 1766992520, 1818230786, 1881613047, 1907959605, + 1967760215, 1982935782, 1999397992, 2001392798, 2006329158, 2008851557, 2085266636, 51961587, 57206291, 60352339, 67108865, 943718402, 1699324759, 1733890180, 1747814436, 1749715159, 1752979652, 1757146773, - 1783388498, 1805502724, 1854228692, 1873281026, 1889085973, 1905563974, - 1925844629, 1963982850, 1967795958, 1973420034, 1983633431, 1998585858, + 1783388498, 1805502724, 1854228698, 1874053333, 1898223949, 1906087319, + 1932928296, 1965115924, 1968053806, 1973420034, 1983633431, 1998585858, 2001309869, 2001392795, 2003183333, 2005925890, 2006974466, 2008325940, 2021937364, 2068523856, 2092255447, 51435587, 52486755, 55110883, 58773795, 60345171, 61395251, 62973651, 68681729, 910163970, 1679960596, 1686491348, 1715310660, 1733054663, 1737099991, 1747176599, 1748100148, 1749656156, 1749801286, 1751288021, 1755076808, 1756625221, - 1757268168, 1783210839, 1790207270, 1803929812, 1806805526, 1818755074, - 1854245076, 1870135298, 1874102998, 1881669634, 1898753862, 1903302038, - 1906135367, 1914900309, 1934172497, 1941178676, 1965334268, 1967788867, - 1968836118, 1971938532, 1982173479, 1983533124, 1986527234, 1990037800, + 1757268168, 1783210839, 1790207270, 1803929812, 1806806678, 1853642948, + 1857653029, 1870268949, 1881288348, 1884120164, 1899272519, 1904412884, + 1907435316, 1919418370, 1935549734, 1941221172, 1966223078, 1967795910, + 1971461414, 1971938532, 1982173479, 1983533124, 1986527234, 1990037800, 1998724870, 2000525512, 2001349704, 2001349736, 2001392796, 2001495140, 2004635806, 2005719336, 2006028454, 2006896969, 2007601444, 2008125638, 2008340774, 2008994116, 2051837468, 2068523853, 2083120164, 2091479332, @@ -317,12 +316,12 @@ static int32_t const ELEMENT_HASHES_DATA[] = { 1747306711, 1747838298, 1748225318, 1749395095, 1749673195, 1749723735, 1749813541, 1749932347, 1751386406, 1753362711, 1755148615, 1756600614, 1757137429, 1757157700, 1763839627, 1782357526, 1783388497, 1786534215, - 1797585096, 1803876550, 1803929861, 1805647874, 1806806678, 1818230786, - 1853642948, 1854228698, 1857653029, 1868312196, 1870268949, 1874053333, - 1881288348, 1881613047, 1884120164, 1898223949, 1899272519, 1902641154, - 1904412884, 1906087319, 1907435316, 1907959605, 1919418370, 1932928296, - 1935549734, 1939219752, 1941221172, 1965115924, 1966223078, 1967760215, - 1967795910, 1968053806, 1971461414}; + 1797585096, 1803876550, 1803929861, 1805647874, 1807599880, 1818755074, + 1854228692, 1854245076, 1864368130, 1870135298, 1873281026, 1874102998, + 1881498736, 1881669634, 1889085973, 1898753862, 1900845386, 1903302038, + 1905563974, 1906135367, 1907661127, 1914900309, 1925844629, 1934172497, + 1938817026, 1941178676, 1963982850, 1965334268, 1967128578, 1967788867, + 1967795958, 1968836118}; staticJArray nsHtml5ElementName::ELEMENT_HASHES = { ELEMENT_HASHES_DATA, MOZ_ARRAY_LENGTH(ELEMENT_HASHES_DATA)}; void nsHtml5ElementName::initializeStatics() { @@ -354,7 +353,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::dir, nsGkAtoms::dir, NS_NewHTMLSharedElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_DIV = new nsHtml5ElementName( nsGkAtoms::div, nsGkAtoms::div, NS_NewHTMLDivElement, @@ -376,7 +375,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::nav, nsGkAtoms::nav, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_PRE = new nsHtml5ElementName( nsGkAtoms::pre, nsGkAtoms::pre, NS_NewHTMLPreElement, @@ -532,13 +531,13 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::aside, nsGkAtoms::aside, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_ARTICLE = new nsHtml5ElementName( nsGkAtoms::article, nsGkAtoms::article, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_ANIMATE = new nsHtml5ElementName( nsGkAtoms::animate, nsGkAtoms::animate, NS_NewHTMLUnknownElement, @@ -587,7 +586,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::figure, nsGkAtoms::figure, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_FECOMPOSITE = new nsHtml5ElementName( nsGkAtoms::fecomposite, nsGkAtoms::feComposite, NS_NewHTMLUnknownElement, @@ -647,7 +646,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::dialog, nsGkAtoms::dialog, NS_NewHTMLDialogElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_FEFUNCG = new nsHtml5ElementName( nsGkAtoms::fefuncg, nsGkAtoms::feFuncG, NS_NewHTMLUnknownElement, @@ -690,12 +689,6 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::th, nsGkAtoms::th, NS_NewHTMLTableCellElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::TD_OR_TH | SPECIAL | SCOPING | OPTIONAL_END_TAG); - ELT_SEARCH = new nsHtml5ElementName( - nsGkAtoms::search, nsGkAtoms::search, NS_NewHTMLElement, - 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_SEARCH_OR_SECTION_OR_SUMMARY | - SPECIAL); ELT_SWITCH = new nsHtml5ElementName( nsGkAtoms::svgSwitch, nsGkAtoms::svgSwitch, NS_NewHTMLUnknownElement, NS_NewSVGSwitchElement, nsHtml5TreeBuilder::OTHER); @@ -787,7 +780,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::figcaption, nsGkAtoms::figcaption, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_MN = new nsHtml5ElementName( nsGkAtoms::mn_, nsGkAtoms::mn_, NS_NewHTMLUnknownElement, @@ -800,7 +793,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::main, nsGkAtoms::main, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_OPTION = new nsHtml5ElementName( nsGkAtoms::option, nsGkAtoms::option, NS_NewHTMLOptionElement, @@ -819,7 +812,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::section, nsGkAtoms::section, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_TSPAN = new nsHtml5ElementName( nsGkAtoms::tspan, nsGkAtoms::tspan, NS_NewHTMLUnknownElement, @@ -846,7 +839,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::hgroup, nsGkAtoms::hgroup, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_RP = new nsHtml5ElementName( nsGkAtoms::rp, nsGkAtoms::rp, NS_NewHTMLElement, NS_NewSVGUnknownElement, @@ -891,7 +884,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::footer, nsGkAtoms::footer, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_FEGAUSSIANBLUR = new nsHtml5ElementName( nsGkAtoms::fegaussianblur, nsGkAtoms::feGaussianBlur, @@ -901,7 +894,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::header, nsGkAtoms::header, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_MARKER = new nsHtml5ElementName( nsGkAtoms::marker, nsGkAtoms::marker, NS_NewHTMLUnknownElement, @@ -920,7 +913,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::address, nsGkAtoms::address, NS_NewHTMLElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_CANVAS = new nsHtml5ElementName( nsGkAtoms::canvas, nsGkAtoms::canvas, NS_NewHTMLCanvasElement, @@ -932,7 +925,7 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::details, nsGkAtoms::details, NS_NewHTMLDetailsElement, 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_SEARCH_OR_SECTION_OR_SUMMARY | + 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_MS = new nsHtml5ElementName( nsGkAtoms::ms_, nsGkAtoms::ms_, NS_NewHTMLUnknownElement, @@ -1074,15 +1067,15 @@ void nsHtml5ElementName::initializeStatics() { nsGkAtoms::summary, nsGkAtoms::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_SEARCH_OR_SECTION_OR_SUMMARY | + 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( nsGkAtoms::tbody, nsGkAtoms::tbody, NS_NewHTMLTableSectionElement, NS_NewSVGUnknownElement, nsHtml5TreeBuilder::TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG); - ELEMENT_NAMES = new nsHtml5ElementName*[207]; - ELEMENT_NAMES[0] = ELT_FIGCAPTION; + ELEMENT_NAMES = new nsHtml5ElementName*[206]; + ELEMENT_NAMES[0] = ELT_MN; ELEMENT_NAMES[1] = ELT_CITE; ELEMENT_NAMES[2] = ELT_FRAMESET; ELEMENT_NAMES[3] = ELT_H1; @@ -1092,8 +1085,8 @@ void nsHtml5ElementName::initializeStatics() { ELEMENT_NAMES[7] = ELT_B; ELEMENT_NAMES[8] = ELT_BGSOUND; ELEMENT_NAMES[9] = ELT_SOURCE; - ELEMENT_NAMES[10] = ELT_DL; - ELEMENT_NAMES[11] = ELT_RP; + ELEMENT_NAMES[10] = ELT_HTML; + ELEMENT_NAMES[11] = ELT_OPTGROUP; ELEMENT_NAMES[12] = ELT_NOFRAMES; ELEMENT_NAMES[13] = ELT_MTEXT; ELEMENT_NAMES[14] = ELT_VIEW; @@ -1103,10 +1096,10 @@ void nsHtml5ElementName::initializeStatics() { ELEMENT_NAMES[18] = ELT_THEAD; ELEMENT_NAMES[19] = ELT_FIGURE; ELEMENT_NAMES[20] = ELT_GLYPHREF; - ELEMENT_NAMES[21] = ELT_TEXTPATH; - ELEMENT_NAMES[22] = ELT_ANIMATETRANSFORM; - ELEMENT_NAMES[23] = ELT_SECTION; - ELEMENT_NAMES[24] = ELT_HR; + ELEMENT_NAMES[21] = ELT_LI; + ELEMENT_NAMES[22] = ELT_ACRONYM; + ELEMENT_NAMES[23] = ELT_TSPAN; + ELEMENT_NAMES[24] = ELT_FEFUNCR; ELEMENT_NAMES[25] = ELT_CANVAS; ELEMENT_NAMES[26] = ELT_BASEFONT; ELEMENT_NAMES[27] = ELT_FEDISTANTLIGHT; @@ -1126,13 +1119,13 @@ void nsHtml5ElementName::initializeStatics() { ELEMENT_NAMES[41] = ELT_TITLE; ELEMENT_NAMES[42] = ELT_FESPECULARLIGHTING; ELEMENT_NAMES[43] = ELT_PATH; - ELEMENT_NAMES[44] = ELT_MARK; - ELEMENT_NAMES[45] = ELT_UL; - ELEMENT_NAMES[46] = ELT_PARAM; - ELEMENT_NAMES[47] = ELT_OPTION; - ELEMENT_NAMES[48] = ELT_VIDEO; - ELEMENT_NAMES[49] = ELT_BR; - ELEMENT_NAMES[50] = ELT_FOOTER; + ELEMENT_NAMES[44] = ELT_MALIGNMARK; + ELEMENT_NAMES[45] = ELT_SMALL; + ELEMENT_NAMES[46] = ELT_ANIMATEMOTION; + ELEMENT_NAMES[47] = ELT_POLYGON; + ELEMENT_NAMES[48] = ELT_COLGROUP; + ELEMENT_NAMES[49] = ELT_ABBR; + ELEMENT_NAMES[50] = ELT_FEGAUSSIANBLUR; ELEMENT_NAMES[51] = ELT_TR; ELEMENT_NAMES[52] = ELT_DETAILS; ELEMENT_NAMES[53] = ELT_DT; @@ -1170,21 +1163,21 @@ void nsHtml5ElementName::initializeStatics() { ELEMENT_NAMES[85] = ELT_FEFUNCG; ELEMENT_NAMES[86] = ELT_STRONG; ELEMENT_NAMES[87] = ELT_MATH; - ELEMENT_NAMES[88] = ELT_SEARCH; - ELEMENT_NAMES[89] = ELT_MI; - ELEMENT_NAMES[90] = ELT_MASK; - ELEMENT_NAMES[91] = ELT_OL; - ELEMENT_NAMES[92] = ELT_SYMBOL; - ELEMENT_NAMES[93] = ELT_EM; - ELEMENT_NAMES[94] = ELT_BUTTON; - ELEMENT_NAMES[95] = ELT_KEYGEN; - ELEMENT_NAMES[96] = ELT_PATTERN; - ELEMENT_NAMES[97] = ELT_AUDIO; - ELEMENT_NAMES[98] = ELT_FEDISPLACEMENTMAP; - ELEMENT_NAMES[99] = ELT_SAMP; - ELEMENT_NAMES[100] = ELT_ANIMATECOLOR; - ELEMENT_NAMES[101] = ELT_FECOMPONENTTRANSFER; - ELEMENT_NAMES[102] = ELT_HEADER; + ELEMENT_NAMES[88] = ELT_SWITCH; + ELEMENT_NAMES[89] = ELT_LINK; + ELEMENT_NAMES[90] = ELT_TRACK; + ELEMENT_NAMES[91] = ELT_LABEL; + ELEMENT_NAMES[92] = ELT_ALTGLYPHITEM; + ELEMENT_NAMES[93] = ELT_FORM; + ELEMENT_NAMES[94] = ELT_CAPTION; + ELEMENT_NAMES[95] = ELT_MAIN; + ELEMENT_NAMES[96] = ELT_SPAN; + ELEMENT_NAMES[97] = ELT_MO; + ELEMENT_NAMES[98] = ELT_HGROUP; + ELEMENT_NAMES[99] = ELT_STOP; + ELEMENT_NAMES[100] = ELT_CENTER; + ELEMENT_NAMES[101] = ELT_FILTER; + ELEMENT_NAMES[102] = ELT_MARKER; ELEMENT_NAMES[103] = ELT_NOBR; ELEMENT_NAMES[104] = ELT_ADDRESS; ELEMENT_NAMES[105] = ELT_DEFS; @@ -1260,35 +1253,34 @@ void nsHtml5ElementName::initializeStatics() { ELEMENT_NAMES[175] = ELT_MGLYPH; ELEMENT_NAMES[176] = ELT_MPATH; ELEMENT_NAMES[177] = ELT_TH; - ELEMENT_NAMES[178] = ELT_SWITCH; - ELEMENT_NAMES[179] = ELT_LI; - ELEMENT_NAMES[180] = ELT_LINK; - ELEMENT_NAMES[181] = ELT_MALIGNMARK; - ELEMENT_NAMES[182] = ELT_TRACK; - ELEMENT_NAMES[183] = ELT_HTML; - ELEMENT_NAMES[184] = ELT_LABEL; - ELEMENT_NAMES[185] = ELT_SMALL; - ELEMENT_NAMES[186] = ELT_ALTGLYPHITEM; - ELEMENT_NAMES[187] = ELT_ACRONYM; - ELEMENT_NAMES[188] = ELT_FORM; - ELEMENT_NAMES[189] = ELT_ANIMATEMOTION; - ELEMENT_NAMES[190] = ELT_CAPTION; - ELEMENT_NAMES[191] = ELT_MN; - ELEMENT_NAMES[192] = ELT_MAIN; - ELEMENT_NAMES[193] = ELT_POLYGON; - ELEMENT_NAMES[194] = ELT_SPAN; - ELEMENT_NAMES[195] = ELT_TSPAN; - ELEMENT_NAMES[196] = ELT_MO; - ELEMENT_NAMES[197] = ELT_COLGROUP; - ELEMENT_NAMES[198] = ELT_HGROUP; - ELEMENT_NAMES[199] = ELT_OPTGROUP; - ELEMENT_NAMES[200] = ELT_STOP; - ELEMENT_NAMES[201] = ELT_ABBR; - ELEMENT_NAMES[202] = ELT_CENTER; - ELEMENT_NAMES[203] = ELT_FEFUNCR; - ELEMENT_NAMES[204] = ELT_FILTER; - ELEMENT_NAMES[205] = ELT_FEGAUSSIANBLUR; - ELEMENT_NAMES[206] = ELT_MARKER; + ELEMENT_NAMES[178] = ELT_TEXTPATH; + ELEMENT_NAMES[179] = ELT_MI; + ELEMENT_NAMES[180] = ELT_MARK; + ELEMENT_NAMES[181] = ELT_MASK; + ELEMENT_NAMES[182] = ELT_DL; + ELEMENT_NAMES[183] = ELT_OL; + ELEMENT_NAMES[184] = ELT_UL; + ELEMENT_NAMES[185] = ELT_SYMBOL; + ELEMENT_NAMES[186] = ELT_ANIMATETRANSFORM; + ELEMENT_NAMES[187] = ELT_EM; + ELEMENT_NAMES[188] = ELT_PARAM; + ELEMENT_NAMES[189] = ELT_BUTTON; + ELEMENT_NAMES[190] = ELT_FIGCAPTION; + ELEMENT_NAMES[191] = ELT_KEYGEN; + ELEMENT_NAMES[192] = ELT_OPTION; + ELEMENT_NAMES[193] = ELT_PATTERN; + ELEMENT_NAMES[194] = ELT_SECTION; + ELEMENT_NAMES[195] = ELT_AUDIO; + ELEMENT_NAMES[196] = ELT_VIDEO; + ELEMENT_NAMES[197] = ELT_FEDISPLACEMENTMAP; + ELEMENT_NAMES[198] = ELT_RP; + ELEMENT_NAMES[199] = ELT_SAMP; + ELEMENT_NAMES[200] = ELT_BR; + ELEMENT_NAMES[201] = ELT_ANIMATECOLOR; + ELEMENT_NAMES[202] = ELT_HR; + ELEMENT_NAMES[203] = ELT_FECOMPONENTTRANSFER; + ELEMENT_NAMES[204] = ELT_FOOTER; + ELEMENT_NAMES[205] = ELT_HEADER; } void nsHtml5ElementName::releaseStatics() { @@ -1394,7 +1386,6 @@ void nsHtml5ElementName::releaseStatics() { delete ELT_MPATH; delete ELT_PATH; delete ELT_TH; - delete ELT_SEARCH; delete ELT_SWITCH; delete ELT_TEXTPATH; delete ELT_LI; diff --git a/parser/html/nsHtml5ElementName.h b/parser/html/nsHtml5ElementName.h index b5158a08cbc5..fc064a2655d8 100644 --- a/parser/html/nsHtml5ElementName.h +++ b/parser/html/nsHtml5ElementName.h @@ -290,7 +290,6 @@ class nsHtml5ElementName { static nsHtml5ElementName* ELT_MPATH; static nsHtml5ElementName* ELT_PATH; static nsHtml5ElementName* ELT_TH; - static nsHtml5ElementName* ELT_SEARCH; static nsHtml5ElementName* ELT_SWITCH; static nsHtml5ElementName* ELT_TEXTPATH; static nsHtml5ElementName* ELT_LI; diff --git a/parser/html/nsHtml5StackNode.h b/parser/html/nsHtml5StackNode.h index be570171c2b0..b73dc57a69eb 100644 --- a/parser/html/nsHtml5StackNode.h +++ b/parser/html/nsHtml5StackNode.h @@ -31,6 +31,7 @@ #include "nsAtom.h" #include "nsHtml5AtomTable.h" +#include "nsHtml5HtmlAttributes.h" #include "nsHtml5String.h" #include "nsNameSpaceManager.h" #include "nsIContent.h" diff --git a/parser/html/nsHtml5TreeBuilder.cpp b/parser/html/nsHtml5TreeBuilder.cpp index ee03d5a81c8f..3c98c221ed17 100644 --- a/parser/html/nsHtml5TreeBuilder.cpp +++ b/parser/html/nsHtml5TreeBuilder.cpp @@ -1165,7 +1165,7 @@ starttagloop: case P: case DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU: case UL_OR_OL_OR_DL: - case 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_SEARCH_OR_SECTION_OR_SUMMARY: { + case 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: { implicitlyCloseP(); appendToCurrentNodeAndPushElementMayFoster(elementName, attributes); @@ -2680,7 +2680,7 @@ void nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName) { case PRE_OR_LISTING: case FIELDSET: case BUTTON: - case 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_SEARCH_OR_SECTION_OR_SUMMARY: { + case 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: { eltPos = findLastInScope(name); if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) { errStrayEndTag(name); diff --git a/parser/html/nsHtml5TreeBuilder.h b/parser/html/nsHtml5TreeBuilder.h index aa9064a60c93..97b0876601a0 100644 --- a/parser/html/nsHtml5TreeBuilder.h +++ b/parser/html/nsHtml5TreeBuilder.h @@ -174,7 +174,7 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState { static const int32_t DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU = 50; static const int32_t - 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_SEARCH_OR_SECTION_OR_SUMMARY = + 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 = 51; static const int32_t RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR = 52; diff --git a/parser/htmlparser/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h index 89e2a0fecf5e..b64dea485484 100644 --- a/parser/htmlparser/nsHTMLTagList.h +++ b/parser/htmlparser/nsHTMLTagList.h @@ -151,7 +151,6 @@ HTML_HTMLELEMENT_TAG(ruby) HTML_HTMLELEMENT_TAG(s) HTML_HTMLELEMENT_TAG(samp) HTML_TAG(script, Script, Script) -HTML_HTMLELEMENT_TAG(search) HTML_HTMLELEMENT_TAG(section) HTML_TAG(select, Select, Select) HTML_HTMLELEMENT_TAG(small) diff --git a/testing/web-platform/meta/html-aam/roles.html.ini b/testing/web-platform/meta/html-aam/roles.html.ini index 597192c133e5..5fdb427625d7 100644 --- a/testing/web-platform/meta/html-aam/roles.html.ini +++ b/testing/web-platform/meta/html-aam/roles.html.ini @@ -17,6 +17,9 @@ [el-a-no-href] expected: PASS + [el-search] + expected: FAIL + [el-u] expected: FAIL diff --git a/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html.ini b/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html.ini index 84002f53262d..172555a6af52 100644 --- a/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html.ini +++ b/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html.ini @@ -1,3 +1,6 @@ [search-styles-iso-8859-8.html] + [ - display] + expected: FAIL + [ - unicode-bidi] expected: FAIL diff --git a/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles.html.ini b/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles.html.ini new file mode 100644 index 000000000000..f54f2a952772 --- /dev/null +++ b/testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles.html.ini @@ -0,0 +1,6 @@ +[search-styles.html] + [ - display] + expected: FAIL + + [ - unicode-bidi] + expected: FAIL