Bug 1394300 - Streamline nsElementTable.cpp

Tag #1375
This commit is contained in:
Matt A. Tobin 2020-04-17 06:14:58 -04:00 • committed by Roy Tam
commit 390ef42e80
2 changed files with 158 additions and 589 deletions

View file

@ -14,597 +14,164 @@
// The Element Table (sung to the tune of Modern Major General) // The Element Table (sung to the tune of Modern Major General)
#ifdef DEBUG
#define ELEM(tag, parent, leaf) { eHTMLTag_##tag, parent, leaf },
#else
#define ELEM(tag, parent, leaf) { parent, leaf },
#endif
const nsHTMLElement gHTMLElements[] = { const nsHTMLElement gHTMLElements[] = {
{ ELEM(unknown, kNone, true)
/*tag*/ eHTMLTag_unknown, ELEM(a, kSpecial, false)
/*parent,leaf*/ kNone, true ELEM(abbr, kPhrase, false)
}, ELEM(acronym, kPhrase, false)
{ ELEM(address, kBlock, false)
/*tag*/ eHTMLTag_a, ELEM(applet, kSpecial, false)
/*parent,leaf*/ kSpecial, false ELEM(area, kNone, true)
}, ELEM(article, kBlock, false)
{ ELEM(aside, kBlock, false)
/*tag*/ eHTMLTag_abbr, ELEM(audio, kSpecial, false)
/*parent,leaf*/ kPhrase, false ELEM(b, kFontStyle, false)
}, ELEM(base, kHeadContent, true)
{ ELEM(basefont, kSpecial, true)
/*tag*/ eHTMLTag_acronym, ELEM(bdo, kSpecial, false)
/*parent,leaf*/ kPhrase, false ELEM(bgsound, (kFlowEntity|kHeadMisc), true)
}, ELEM(big, kFontStyle, false)
{ ELEM(blockquote, kBlock, false)
/*tag*/ eHTMLTag_address, ELEM(body, kHTMLContent, false)
/*parent,leaf*/ kBlock, false ELEM(br, kSpecial, true)
}, ELEM(button, kFormControl, false)
{ ELEM(canvas, kSpecial, false)
/*tag*/ eHTMLTag_applet, ELEM(caption, kNone, false)
/*parent,leaf*/ kSpecial, false ELEM(center, kBlock, false)
}, ELEM(cite, kPhrase, false)
{ ELEM(code, kPhrase, false)
/*tag*/ eHTMLTag_area, ELEM(col, kNone, true)
/*parent,leaf*/ kNone, true ELEM(colgroup, kNone, false)
}, ELEM(content, kNone, false)
{ ELEM(data, kPhrase, false)
/*tag*/ eHTMLTag_article, ELEM(datalist, kSpecial, false)
/*parent,leaf*/ kBlock, false ELEM(dd, kInlineEntity, false)
}, ELEM(del, kFlowEntity, false)
{ ELEM(details, kBlock, false)
/*tag*/ eHTMLTag_aside, ELEM(dfn, kPhrase, false)
/*parent,leaf*/ kBlock, false ELEM(dialog, kBlock, false)
}, ELEM(dir, kList, false)
{ ELEM(div, kBlock, false)
/*tag*/ eHTMLTag_audio, ELEM(dl, kBlock, false)
/*parent,leaf*/ kSpecial, false ELEM(dt, kInlineEntity, false)
}, ELEM(em, kPhrase, false)
{ ELEM(embed, kSpecial, true)
/*tag*/ eHTMLTag_b, ELEM(fieldset, kBlock, false)
/*parent,leaf*/ kFontStyle, false ELEM(figcaption, kPhrase, false)
}, ELEM(figure, kBlock, false)
{ ELEM(font, kFontStyle, false)
/*tag*/ eHTMLTag_base, ELEM(footer, kBlock, false)
/*parent,leaf*/ kHeadContent, true ELEM(form, kBlock, false)
}, ELEM(frame, kNone, true)
{ ELEM(frameset, kHTMLContent, false)
/*tag*/ eHTMLTag_basefont, ELEM(h1, kHeading, false)
/*parent,leaf*/ kSpecial, true ELEM(h2, kHeading, false)
}, ELEM(h3, kHeading, false)
{ ELEM(h4, kHeading, false)
/*tag*/ eHTMLTag_bdo, ELEM(h5, kHeading, false)
/*parent,leaf*/ kSpecial, false ELEM(h6, kHeading, false)
}, ELEM(head, kHTMLContent, false)
{ ELEM(header, kBlock, false)
/*tag*/ eHTMLTag_bgsound, ELEM(hgroup, kBlock, false)
/*parent,leaf*/ (kFlowEntity|kHeadMisc), true ELEM(hr, kBlock, true)
}, ELEM(html, kNone, false)
{ ELEM(i, kFontStyle, false)
/*tag*/ eHTMLTag_big, ELEM(iframe, kSpecial, false)
/*parent,leaf*/ kFontStyle, false ELEM(image, kSpecial, true)
}, ELEM(img, kSpecial, true)
{ ELEM(input, kFormControl, true)
/*tag*/ eHTMLTag_blockquote, ELEM(ins, kFlowEntity, false)
/*parent,leaf*/ kBlock, false ELEM(kbd, kPhrase, false)
}, ELEM(keygen, kFlowEntity, true)
{ ELEM(label, kFormControl, false)
/*tag*/ eHTMLTag_body, ELEM(legend, kNone, false)
/*parent,leaf*/ kHTMLContent, false ELEM(li, kBlockEntity, false)
}, ELEM(link, kAllTags - kHeadContent, true)
{ ELEM(listing, kPreformatted, false)
/*tag*/ eHTMLTag_br, ELEM(main, kBlock, false)
/*parent,leaf*/ kSpecial, true ELEM(map, kSpecial, false)
}, ELEM(mark, kSpecial, false)
{ ELEM(marquee, kSpecial, false)
/*tag*/ eHTMLTag_button, ELEM(menu, kList, false)
/*parent,leaf*/ kFormControl, false ELEM(menuitem, kFlowEntity, false)
}, ELEM(meta, kHeadContent, true)
{ ELEM(meter, kFormControl, false)
/*tag*/ eHTMLTag_canvas, ELEM(multicol, kBlock, false)
/*parent,leaf*/ kSpecial, false ELEM(nav, kBlock, false)
}, ELEM(nobr, kExtensions, false)
{ ELEM(noembed, kFlowEntity, false)
/*tag*/ eHTMLTag_caption, ELEM(noframes, kFlowEntity, false)
/*parent,leaf*/ kNone, false ELEM(noscript, kFlowEntity|kHeadMisc, false)
}, ELEM(object, kSpecial, false)
{ ELEM(ol, kList, false)
/*tag*/ eHTMLTag_center, ELEM(optgroup, kNone, false)
/*parent,leaf*/ kBlock, false ELEM(option, kNone, false)
}, ELEM(output, kSpecial, false)
{ ELEM(p, kBlock, false)
/*tag*/ eHTMLTag_cite, ELEM(param, kSpecial, true)
/*parent,leaf*/ kPhrase, false ELEM(picture, kSpecial, false)
}, ELEM(plaintext, kExtensions, false)
{ ELEM(pre, kBlock|kPreformatted, false)
/*tag*/ eHTMLTag_code, ELEM(progress, kFormControl, false)
/*parent,leaf*/ kPhrase, false ELEM(q, kSpecial, false)
}, ELEM(rb, kPhrase, false)
{ ELEM(rp, kPhrase, false)
/*tag*/ eHTMLTag_col, ELEM(rt, kPhrase, false)
/*parent,leaf*/ kNone, true ELEM(rtc, kPhrase, false)
}, ELEM(ruby, kPhrase, false)
{ ELEM(s, kFontStyle, false)
/*tag*/ eHTMLTag_colgroup, ELEM(samp, kPhrase, false)
/*parent,leaf*/ kNone, false ELEM(script, (kSpecial|kHeadContent), false)
}, ELEM(section, kBlock, false)
{ ELEM(select, kFormControl, false)
/*tag*/ eHTMLTag_content, ELEM(shadow, kFlowEntity, false)
/*parent,leaf*/ kNone, false ELEM(small, kFontStyle, false)
}, ELEM(source, kSpecial, true)
{ ELEM(span, kSpecial, false)
/*tag*/ eHTMLTag_data, ELEM(strike, kFontStyle, false)
/*parent,leaf*/ kPhrase, false ELEM(strong, kPhrase, false)
}, ELEM(style, kAllTags - kHeadContent, false)
{ ELEM(sub, kSpecial, false)
/*tag*/ eHTMLTag_datalist, ELEM(summary, kBlock, false)
/*parent,leaf*/ kSpecial, false ELEM(sup, kSpecial, false)
}, ELEM(table, kBlock, false)
{ ELEM(tbody, kNone, false)
/*tag*/ eHTMLTag_dd, ELEM(td, kNone, false)
/*parent,leaf*/ kInlineEntity, false ELEM(textarea, kFormControl, false)
}, ELEM(tfoot, kNone, false)
{ ELEM(th, kNone, false)
/*tag*/ eHTMLTag_del, ELEM(thead, kNone, false)
/*parent,leaf*/ kFlowEntity, false ELEM(template, kNone, false)
}, ELEM(time, kPhrase, false)
{ ELEM(title, kHeadContent, false)
/*tag*/ eHTMLTag_details, ELEM(tr, kNone, false)
/*parent,leaf*/ kBlock, false ELEM(track, kSpecial, true)
}, ELEM(tt, kFontStyle, false)
{ ELEM(u, kFontStyle, false)
/*tag*/ eHTMLTag_dfn, ELEM(ul, kList, false)
/*parent,leaf*/ kPhrase, false ELEM(var, kPhrase, false)
}, ELEM(video, kSpecial, false)
{ ELEM(wbr, kExtensions, true)
/*tag*/ eHTMLTag_dialog, ELEM(xmp, kInlineEntity|kPreformatted, false)
/*parent,leaf*/ kBlock, false ELEM(text, kFlowEntity, true)
}, ELEM(whitespace, kFlowEntity|kHeadMisc, true)
{ ELEM(newline, kFlowEntity|kHeadMisc, true)
/*tag*/ eHTMLTag_dir, ELEM(comment, kFlowEntity|kHeadMisc, false)
/*parent,leaf*/ kList, false ELEM(entity, kFlowEntity, false)
}, ELEM(doctypeDecl, kFlowEntity, false)
{ ELEM(markupDecl, kFlowEntity, false)
/*tag*/ eHTMLTag_div, ELEM(instruction, kFlowEntity, false)
/*parent,leaf*/ kBlock, false ELEM(userdefined, (kFlowEntity|kHeadMisc), false)
},
{
/*tag*/ eHTMLTag_dl,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_dt,
/*parent,leaf*/ kInlineEntity, false
},
{
/*tag*/ eHTMLTag_em,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_embed,
/*parent,leaf*/ kSpecial, true
},
{
/*tag*/ eHTMLTag_fieldset,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_figcaption,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_figure,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_font,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_footer,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_form,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_frame,
/*parent,leaf*/ kNone, true
},
{
/*tag*/ eHTMLTag_frameset,
/*parent,leaf*/ kHTMLContent, false
},
{
/*tag*/ eHTMLTag_h1,
/*parent,leaf*/ kHeading, false
},
{
/*tag*/ eHTMLTag_h2,
/*parent,leaf*/ kHeading, false
},
{
/*tag*/ eHTMLTag_h3,
/*parent,leaf*/ kHeading, false
},
{
/*tag*/ eHTMLTag_h4,
/*parent,leaf*/ kHeading, false
},
{
/*tag*/ eHTMLTag_h5,
/*parent,leaf*/ kHeading, false
},
{
/*tag*/ eHTMLTag_h6,
/*parent,leaf*/ kHeading, false
},
{
/*tag*/ eHTMLTag_head,
/*parent,leaf*/ kHTMLContent, false
},
{
/*tag*/ eHTMLTag_header,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_hgroup,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_hr,
/*parent,leaf*/ kBlock, true
},
{
/*tag*/ eHTMLTag_html,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_i,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_iframe,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_image,
/*parent,leaf*/ kSpecial, true
},
{
/*tag*/ eHTMLTag_img,
/*parent,leaf*/ kSpecial, true
},
{
/*tag*/ eHTMLTag_input,
/*parent,leaf*/ kFormControl, true
},
{
/*tag*/ eHTMLTag_ins,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_kbd,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_keygen,
/*parent,leaf*/ kFlowEntity, true
},
{
/*tag*/ eHTMLTag_label,
/*parent,leaf*/ kFormControl, false
},
{
/*tag*/ eHTMLTag_legend,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_li,
/*parent,leaf*/ kBlockEntity, false
},
{
/*tag*/ eHTMLTag_link,
/*parent,leaf*/ kAllTags - kHeadContent, true
},
{
/*tag*/ eHTMLTag_listing,
/*parent,leaf*/ kPreformatted, false
},
{
/*tag*/ eHTMLTag_main,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_map,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_mark,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_marquee,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_menu,
/*parent,leaf*/ kList, false
},
{
/*tag*/ eHTMLTag_menuitem,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_meta,
/*parent,leaf*/ kHeadContent, true
},
{
/*tag*/ eHTMLTag_meter,
/*parent,leaf*/ kFormControl, false
},
{
/*tag*/ eHTMLTag_multicol,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_nav,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_nobr,
/*parent,leaf*/ kExtensions, false
},
{
/*tag*/ eHTMLTag_noembed,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_noframes,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_noscript,
/*parent,leaf*/ kFlowEntity|kHeadMisc, false
},
{
/*tag*/ eHTMLTag_object,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_ol,
/*parent,leaf*/ kList, false
},
{
/*tag*/ eHTMLTag_optgroup,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_option,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_output,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_p,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_param,
/*parent,leaf*/ kSpecial, true
},
{
/*tag*/ eHTMLTag_picture,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_plaintext,
/*parent,leaf*/ kExtensions, false
},
{
/*tag*/ eHTMLTag_pre,
/*parent,leaf*/ kBlock|kPreformatted, false
},
{
/*tag*/ eHTMLTag_progress,
/*parent,leaf*/ kFormControl, false
},
{
/*tag*/ eHTMLTag_q,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_rb,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_rp,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_rt,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_rtc,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_ruby,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_s,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_samp,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_script,
/*parent,leaf*/ (kSpecial|kHeadContent), false
},
{
/*tag*/ eHTMLTag_section,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_select,
/*parent,leaf*/ kFormControl, false
},
{
/*tag*/ eHTMLTag_shadow,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_small,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_source,
/*parent,leaf*/ kSpecial, true
},
{
/*tag*/ eHTMLTag_span,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_strike,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_strong,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_style,
/*parent,leaf*/ kAllTags - kHeadContent, false
},
{
/*tag*/ eHTMLTag_sub,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_summary,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_sup,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_table,
/*parent,leaf*/ kBlock, false
},
{
/*tag*/ eHTMLTag_tbody,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_td,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_textarea,
/*parent,leaf*/ kFormControl, false
},
{
/*tag*/ eHTMLTag_tfoot,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_th,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_thead,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_template,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_time,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_title,
/*parent,leaf*/ kHeadContent, false
},
{
/*tag*/ eHTMLTag_tr,
/*parent,leaf*/ kNone, false
},
{
/*tag*/ eHTMLTag_track,
/*parent,leaf*/ kSpecial, true
},
{
/*tag*/ eHTMLTag_tt,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_u,
/*parent,leaf*/ kFontStyle, false
},
{
/*tag*/ eHTMLTag_ul,
/*parent,leaf*/ kList, false
},
{
/*tag*/ eHTMLTag_var,
/*parent,leaf*/ kPhrase, false
},
{
/*tag*/ eHTMLTag_video,
/*parent,leaf*/ kSpecial, false
},
{
/*tag*/ eHTMLTag_wbr,
/*parent,leaf*/ kExtensions, true
},
{
/*tag*/ eHTMLTag_xmp,
/*parent,leaf*/ kInlineEntity|kPreformatted, false
},
{
/*tag*/ eHTMLTag_text,
/*parent,leaf*/ kFlowEntity, true
},
{
/*tag*/ eHTMLTag_whitespace,
/*parent,leaf*/ kFlowEntity|kHeadMisc, true
},
{
/*tag*/ eHTMLTag_newline,
/*parent,leaf*/ kFlowEntity|kHeadMisc, true
},
{
/*tag*/ eHTMLTag_comment,
/*parent,leaf*/ kFlowEntity|kHeadMisc, false
},
{
/*tag*/ eHTMLTag_entity,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_doctypeDecl,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_markupDecl,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_instruction,
/*parent,leaf*/ kFlowEntity, false
},
{
/*tag*/ eHTMLTag_userdefined,
/*parent,leaf*/ (kFlowEntity|kHeadMisc), false
},
}; };
#undef ELEM
/*********************************************************************************************/ /*********************************************************************************************/
bool nsHTMLElement::IsContainer(eHTMLTags aChild) bool nsHTMLElement::IsContainer(eHTMLTags aChild)

View file

@ -80,7 +80,9 @@ inline bool TestBits(int aBitset,int aTest) {
struct nsHTMLElement { struct nsHTMLElement {
bool IsMemberOf(int32_t aType) const; bool IsMemberOf(int32_t aType) const;
#ifdef DEBUG
eHTMLTags mTagID; eHTMLTags mTagID;
#endif
int mParentBits; //defines groups that can contain this element int mParentBits; //defines groups that can contain this element
bool mLeaf; bool mLeaf;