Backed out 3 changesets (bug 1824121) for causing wpt failures in html5lib_search-element.html. CLOSED TREE

Backed out changeset e3aec91d79e4 (bug 1824121)
Backed out changeset e3a3324b1732 (bug 1824121)
Backed out changeset 6ff5c272ab8e (bug 1824121)

accessible/base/HTMLMarkupMap.h

@@ -425,5 +425,3 @@ MARKUPMAP(
       return new HTMLMeterAccessible(aElement, aContext->Document());
     },
     roles::METER)
-
-MARKUPMAP(search, New_HyperText, roles::LANDMARK)

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

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 @@
 
   <p id="s_container">normal<s>Removed</s></p>
   <p id="samp_container">normal<samp>sample</samp></p>
-  <search id="search">search</search>
   <section id="section">section</section>
   <section id="named_section" aria-label="foo">named section</section>
   <p id="small_container">normal<small>small</small></p>

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::section || nameAtom == nsGkAtoms::span)) {
-        nameAtom == nsGkAtoms::span)) {
     return false;
   }
 

editor/libeditor/HTMLEditUtils.cpp

@@ -954,7 +954,7 @@ bool HTMLEditUtils::ShouldInsertLinefeedCharacter(
 // address, applet, article, aside, blockquote, button, center, del, details,
 // dialog, dir, div, dl, fieldset, figure, footer, form, h1, h2, h3, h4, h5,
 // h6, header, hgroup, hr, iframe, ins, main, map, menu, nav, noframes,
-// noscript, object, ol, p, pre, table, search, section, summary, ul
+// noscript, object, ol, p, pre, table, section, summary, ul
 #define GROUP_BLOCK (1 << 7)
 
 // frame, frameset
@@ -1155,7 +1155,6 @@ static const ElementInfo kElements[eHTMLTag_userdefined] = {
     ELEM(s, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
     ELEM(samp, true, true, GROUP_PHRASE, GROUP_INLINE_ELEMENT),
     ELEM(script, true, false, GROUP_HEAD_CONTENT | GROUP_SPECIAL, GROUP_LEAF),
-    ELEM(search, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
     ELEM(section, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
     ELEM(select, true, false, GROUP_FORMCONTROL, GROUP_SELECT_CONTENT),
     ELEM(small, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),

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;

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:
+//            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_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_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:
@@ -680,7 +680,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -704,7 +704,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -880,11 +880,11 @@ TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_
 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);
+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);
+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, 
@@ -940,7 +940,7 @@ TreeBuilder.FRAME | SPECIAL);
 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);
+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, 
@@ -1008,7 +1008,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -1057,10 +1057,6 @@ public static final ElementName TH = new ElementName("th", "th",
 // CPPONLY: NS_NewHTMLTableCellElement,
 // 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", 
 // CPPONLY: NS_NewHTMLUnknownElement,
 // CPPONLY: NS_NewSVGSwitchElement, 
@@ -1164,7 +1160,7 @@ TreeBuilder.CAPTION | SPECIAL | SCOPING);
 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);
+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, 
@@ -1176,7 +1172,7 @@ TreeBuilder.KEYGEN | SPECIAL);
 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);
+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, 
@@ -1196,7 +1192,7 @@ TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
 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);
+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, 
@@ -1224,7 +1220,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -1276,7 +1272,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -1284,7 +1280,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -1304,7 +1300,7 @@ TreeBuilder.TR | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
 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);
+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, 
@@ -1316,7 +1312,7 @@ TreeBuilder.OTHER);
 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);
+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, 
@@ -1476,13 +1472,13 @@ TreeBuilder.RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
 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);
+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, 
 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,
+HTML,
-RP,
+OPTGROUP,
 NOFRAMES,
 MTEXT,
 VIEW,
@@ -1503,10 +1499,10 @@ FEFUNCA,
 THEAD,
 FIGURE,
 GLYPHREF,
-TEXTPATH,
+LI,
-ANIMATETRANSFORM,
+ACRONYM,
-SECTION,
+TSPAN,
-HR,
+FEFUNCR,
 CANVAS,
 BASEFONT,
 FEDISTANTLIGHT,
@@ -1526,13 +1522,13 @@ LINE,
 TITLE,
 FESPECULARLIGHTING,
 PATH,
-MARK,
+MALIGNMARK,
-UL,
+SMALL,
-PARAM,
+ANIMATEMOTION,
-OPTION,
+POLYGON,
-VIDEO,
+COLGROUP,
-BR,
+ABBR,
-FOOTER,
+FEGAUSSIANBLUR,
 TR,
 DETAILS,
 DT,
@@ -1570,21 +1566,21 @@ TEMPLATE,
 FEFUNCG,
 STRONG,
 MATH,
-SEARCH,
+SWITCH,
-MI,
+LINK,
-MASK,
+TRACK,
-OL,
+LABEL,
-SYMBOL,
+ALTGLYPHITEM,
-EM,
+FORM,
-BUTTON,
+CAPTION,
-KEYGEN,
+MAIN,
-PATTERN,
+SPAN,
-AUDIO,
+MO,
-FEDISPLACEMENTMAP,
+HGROUP,
-SAMP,
+STOP,
-ANIMATECOLOR,
+CENTER,
-FECOMPONENTTRANSFER,
+FILTER,
-HEADER,
+MARKER,
 NOBR,
 ADDRESS,
 DEFS,
@@ -1660,38 +1656,37 @@ ALTGLYPH,
 MGLYPH,
 MPATH,
 TH,
-SWITCH,
+TEXTPATH,
-LI,
+MI,
-LINK,
+MARK,
-MALIGNMARK,
+MASK,
-TRACK,
+DL,
-HTML,
+OL,
-LABEL,
+UL,
-SMALL,
+SYMBOL,
-ALTGLYPHITEM,
+ANIMATETRANSFORM,
-ACRONYM,
+EM,
-FORM,
+PARAM,
-ANIMATEMOTION,
+BUTTON,
-CAPTION,
+FIGCAPTION,
-MN,
+KEYGEN,
-MAIN,
+OPTION,
-POLYGON,
+PATTERN,
-SPAN,
+SECTION,
-TSPAN,
+AUDIO,
-MO,
+VIDEO,
-COLGROUP,
+FEDISPLACEMENTMAP,
-HGROUP,
+RP,
-OPTGROUP,
+SAMP,
-STOP,
+BR,
-ABBR,
+ANIMATECOLOR,
-CENTER,
+HR,
-FEFUNCR,
+FECOMPONENTTRANSFER,
-FILTER,
+FOOTER,
-FEGAUSSIANBLUR,
+HEADER,
-MARKER,
 };
 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,
+1868312196,
-1938817026,
+1939219752,
 1988763672,
 2005324101,
 2060065124,
@@ -1712,10 +1707,10 @@ private final static int[] ELEMENT_HASHES = {
 1740181637,
 1749905526,
 1766992520,
-1807599880,
+1818230786,
-1881498736,
+1881613047,
-1907661127,
+1907959605,
-1967128578,
+1967760215,
 1982935782,
 1999397992,
 2001392798,
@@ -1735,13 +1730,13 @@ private final static int[] ELEMENT_HASHES = {
 1757146773,
 1783388498,
 1805502724,
-1854228692,
+1854228698,
-1873281026,
+1874053333,
-1889085973,
+1898223949,
-1905563974,
+1906087319,
-1925844629,
+1932928296,
-1963982850,
+1965115924,
-1967795958,
+1968053806,
 1973420034,
 1983633431,
 1998585858,
@@ -1779,21 +1774,21 @@ private final static int[] ELEMENT_HASHES = {
 1783210839,
 1790207270,
 1803929812,
-1806805526,
+1806806678,
-1818755074,
+1853642948,
-1854245076,
+1857653029,
-1870135298,
+1870268949,
-1874102998,
+1881288348,
-1881669634,
+1884120164,
-1898753862,
+1899272519,
-1903302038,
+1904412884,
-1906135367,
+1907435316,
-1914900309,
+1919418370,
-1934172497,
+1935549734,
-1941178676,
+1941221172,
-1965334268,
+1966223078,
-1967788867,
+1967795910,
-1968836118,
+1971461414,
 1971938532,
 1982173479,
 1983533124,
@@ -1869,34 +1864,33 @@ private final static int[] ELEMENT_HASHES = {
 1803876550,
 1803929861,
 1805647874,
-1806806678,
+1807599880,
-1818230786,
+1818755074,
-1853642948,
+1854228692,
-1854228698,
+1854245076,
-1857653029,
+1864368130,
-1868312196,
+1870135298,
-1870268949,
+1873281026,
-1874053333,
+1874102998,
-1881288348,
+1881498736,
-1881613047,
+1881669634,
-1884120164,
+1889085973,
-1898223949,
+1898753862,
-1899272519,
+1900845386,
-1902641154,
+1903302038,
-1904412884,
+1905563974,
-1906087319,
+1906135367,
-1907435316,
+1907661127,
-1907959605,
+1914900309,
-1919418370,
+1925844629,
-1932928296,
+1934172497,
-1935549734,
+1938817026,
-1939219752,
+1941178676,
-1941221172,
+1963982850,
-1965115924,
+1965334268,
-1966223078,
+1967128578,
-1967760215,
+1967788867,
-1967795910,
+1967795958,
-1968053806,
+1968836118,
-1971461414,
 };
 }

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.
      *

parser/html/javasrc/TreeBuilder.java

@@ -168,7 +168,7 @@ public abstract class TreeBuilder<T> 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<T> 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<T> 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);

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,
+    1902641154, 1748359220, 2001349720, 876609538,  1798686984, 1971465813,
-    2007781534, 59768833,   1730965751, 1756474198, 1864368130, 1938817026,
+    2007781534, 59768833,   1730965751, 1756474198, 1868312196, 1939219752,
     1988763672, 2005324101, 2060065124, 52490899,   62390273,   1682547543,
-    1740181637, 1749905526, 1766992520, 1807599880, 1881498736, 1907661127,
+    1740181637, 1749905526, 1766992520, 1818230786, 1881613047, 1907959605,
-    1967128578, 1982935782, 1999397992, 2001392798, 2006329158, 2008851557,
+    1967760215, 1982935782, 1999397992, 2001392798, 2006329158, 2008851557,
     2085266636, 51961587,   57206291,   60352339,   67108865,   943718402,
     1699324759, 1733890180, 1747814436, 1749715159, 1752979652, 1757146773,
-    1783388498, 1805502724, 1854228692, 1873281026, 1889085973, 1905563974,
+    1783388498, 1805502724, 1854228698, 1874053333, 1898223949, 1906087319,
-    1925844629, 1963982850, 1967795958, 1973420034, 1983633431, 1998585858,
+    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,
+    1757268168, 1783210839, 1790207270, 1803929812, 1806806678, 1853642948,
-    1854245076, 1870135298, 1874102998, 1881669634, 1898753862, 1903302038,
+    1857653029, 1870268949, 1881288348, 1884120164, 1899272519, 1904412884,
-    1906135367, 1914900309, 1934172497, 1941178676, 1965334268, 1967788867,
+    1907435316, 1919418370, 1935549734, 1941221172, 1966223078, 1967795910,
-    1968836118, 1971938532, 1982173479, 1983533124, 1986527234, 1990037800,
+    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,
+    1797585096, 1803876550, 1803929861, 1805647874, 1807599880, 1818755074,
-    1853642948, 1854228698, 1857653029, 1868312196, 1870268949, 1874053333,
+    1854228692, 1854245076, 1864368130, 1870135298, 1873281026, 1874102998,
-    1881288348, 1881613047, 1884120164, 1898223949, 1899272519, 1902641154,
+    1881498736, 1881669634, 1889085973, 1898753862, 1900845386, 1903302038,
-    1904412884, 1906087319, 1907435316, 1907959605, 1919418370, 1932928296,
+    1905563974, 1906135367, 1907661127, 1914900309, 1925844629, 1934172497,
-    1935549734, 1939219752, 1941221172, 1965115924, 1966223078, 1967760215,
+    1938817026, 1941178676, 1963982850, 1965334268, 1967128578, 1967788867,
-    1967795910, 1968053806, 1971461414};
+    1967795958, 1968836118};
 staticJArray<int32_t, int32_t> 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 = new nsHtml5ElementName*[206];
-  ELEMENT_NAMES[0] = ELT_FIGCAPTION;
+  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[10] = ELT_HTML;
-  ELEMENT_NAMES[11] = ELT_RP;
+  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[21] = ELT_LI;
-  ELEMENT_NAMES[22] = ELT_ANIMATETRANSFORM;
+  ELEMENT_NAMES[22] = ELT_ACRONYM;
-  ELEMENT_NAMES[23] = ELT_SECTION;
+  ELEMENT_NAMES[23] = ELT_TSPAN;
-  ELEMENT_NAMES[24] = ELT_HR;
+  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[44] = ELT_MALIGNMARK;
-  ELEMENT_NAMES[45] = ELT_UL;
+  ELEMENT_NAMES[45] = ELT_SMALL;
-  ELEMENT_NAMES[46] = ELT_PARAM;
+  ELEMENT_NAMES[46] = ELT_ANIMATEMOTION;
-  ELEMENT_NAMES[47] = ELT_OPTION;
+  ELEMENT_NAMES[47] = ELT_POLYGON;
-  ELEMENT_NAMES[48] = ELT_VIDEO;
+  ELEMENT_NAMES[48] = ELT_COLGROUP;
-  ELEMENT_NAMES[49] = ELT_BR;
+  ELEMENT_NAMES[49] = ELT_ABBR;
-  ELEMENT_NAMES[50] = ELT_FOOTER;
+  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[88] = ELT_SWITCH;
-  ELEMENT_NAMES[89] = ELT_MI;
+  ELEMENT_NAMES[89] = ELT_LINK;
-  ELEMENT_NAMES[90] = ELT_MASK;
+  ELEMENT_NAMES[90] = ELT_TRACK;
-  ELEMENT_NAMES[91] = ELT_OL;
+  ELEMENT_NAMES[91] = ELT_LABEL;
-  ELEMENT_NAMES[92] = ELT_SYMBOL;
+  ELEMENT_NAMES[92] = ELT_ALTGLYPHITEM;
-  ELEMENT_NAMES[93] = ELT_EM;
+  ELEMENT_NAMES[93] = ELT_FORM;
-  ELEMENT_NAMES[94] = ELT_BUTTON;
+  ELEMENT_NAMES[94] = ELT_CAPTION;
-  ELEMENT_NAMES[95] = ELT_KEYGEN;
+  ELEMENT_NAMES[95] = ELT_MAIN;
-  ELEMENT_NAMES[96] = ELT_PATTERN;
+  ELEMENT_NAMES[96] = ELT_SPAN;
-  ELEMENT_NAMES[97] = ELT_AUDIO;
+  ELEMENT_NAMES[97] = ELT_MO;
-  ELEMENT_NAMES[98] = ELT_FEDISPLACEMENTMAP;
+  ELEMENT_NAMES[98] = ELT_HGROUP;
-  ELEMENT_NAMES[99] = ELT_SAMP;
+  ELEMENT_NAMES[99] = ELT_STOP;
-  ELEMENT_NAMES[100] = ELT_ANIMATECOLOR;
+  ELEMENT_NAMES[100] = ELT_CENTER;
-  ELEMENT_NAMES[101] = ELT_FECOMPONENTTRANSFER;
+  ELEMENT_NAMES[101] = ELT_FILTER;
-  ELEMENT_NAMES[102] = ELT_HEADER;
+  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[178] = ELT_TEXTPATH;
-  ELEMENT_NAMES[179] = ELT_LI;
+  ELEMENT_NAMES[179] = ELT_MI;
-  ELEMENT_NAMES[180] = ELT_LINK;
+  ELEMENT_NAMES[180] = ELT_MARK;
-  ELEMENT_NAMES[181] = ELT_MALIGNMARK;
+  ELEMENT_NAMES[181] = ELT_MASK;
-  ELEMENT_NAMES[182] = ELT_TRACK;
+  ELEMENT_NAMES[182] = ELT_DL;
-  ELEMENT_NAMES[183] = ELT_HTML;
+  ELEMENT_NAMES[183] = ELT_OL;
-  ELEMENT_NAMES[184] = ELT_LABEL;
+  ELEMENT_NAMES[184] = ELT_UL;
-  ELEMENT_NAMES[185] = ELT_SMALL;
+  ELEMENT_NAMES[185] = ELT_SYMBOL;
-  ELEMENT_NAMES[186] = ELT_ALTGLYPHITEM;
+  ELEMENT_NAMES[186] = ELT_ANIMATETRANSFORM;
-  ELEMENT_NAMES[187] = ELT_ACRONYM;
+  ELEMENT_NAMES[187] = ELT_EM;
-  ELEMENT_NAMES[188] = ELT_FORM;
+  ELEMENT_NAMES[188] = ELT_PARAM;
-  ELEMENT_NAMES[189] = ELT_ANIMATEMOTION;
+  ELEMENT_NAMES[189] = ELT_BUTTON;
-  ELEMENT_NAMES[190] = ELT_CAPTION;
+  ELEMENT_NAMES[190] = ELT_FIGCAPTION;
-  ELEMENT_NAMES[191] = ELT_MN;
+  ELEMENT_NAMES[191] = ELT_KEYGEN;
-  ELEMENT_NAMES[192] = ELT_MAIN;
+  ELEMENT_NAMES[192] = ELT_OPTION;
-  ELEMENT_NAMES[193] = ELT_POLYGON;
+  ELEMENT_NAMES[193] = ELT_PATTERN;
-  ELEMENT_NAMES[194] = ELT_SPAN;
+  ELEMENT_NAMES[194] = ELT_SECTION;
-  ELEMENT_NAMES[195] = ELT_TSPAN;
+  ELEMENT_NAMES[195] = ELT_AUDIO;
-  ELEMENT_NAMES[196] = ELT_MO;
+  ELEMENT_NAMES[196] = ELT_VIDEO;
-  ELEMENT_NAMES[197] = ELT_COLGROUP;
+  ELEMENT_NAMES[197] = ELT_FEDISPLACEMENTMAP;
-  ELEMENT_NAMES[198] = ELT_HGROUP;
+  ELEMENT_NAMES[198] = ELT_RP;
-  ELEMENT_NAMES[199] = ELT_OPTGROUP;
+  ELEMENT_NAMES[199] = ELT_SAMP;
-  ELEMENT_NAMES[200] = ELT_STOP;
+  ELEMENT_NAMES[200] = ELT_BR;
-  ELEMENT_NAMES[201] = ELT_ABBR;
+  ELEMENT_NAMES[201] = ELT_ANIMATECOLOR;
-  ELEMENT_NAMES[202] = ELT_CENTER;
+  ELEMENT_NAMES[202] = ELT_HR;
-  ELEMENT_NAMES[203] = ELT_FEFUNCR;
+  ELEMENT_NAMES[203] = ELT_FECOMPONENTTRANSFER;
-  ELEMENT_NAMES[204] = ELT_FILTER;
+  ELEMENT_NAMES[204] = ELT_FOOTER;
-  ELEMENT_NAMES[205] = ELT_FEGAUSSIANBLUR;
+  ELEMENT_NAMES[205] = ELT_HEADER;
-  ELEMENT_NAMES[206] = ELT_MARKER;
 }
 
 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;

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;

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);

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;

parser/htmlparser/nsElementTable.cpp

@@ -140,7 +140,6 @@ static const HTMLElement gHTMLElements[] = {
   ELEM(s,           ____, true)
   ELEM(samp,        ____, true)
   ELEM(script,      ____, true)
-  ELEM(search,      true, true)
   ELEM(section,     true, true)
   ELEM(select,      ____, true)
   ELEM(small,       ____, true)

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)

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
 

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]
+  [<search> - display]
+    expected: FAIL
+
   [<search> - unicode-bidi]
     expected: FAIL

testing/web-platform/meta/html/rendering/non-replaced-elements/flow-content-0/search-styles.html.ini

@@ -0,0 +1,6 @@
+[search-styles.html]
+  [<search> - display]
+    expected: FAIL
+
+  [<search> - unicode-bidi]
+    expected: FAIL