Bug 1266495 - Remove <isindex>. r=wchen

MozReview-Commit-ID: KM0sTMM1GaD
This commit is contained in:
Henri Sivonen
2017-07-05 11:42:04 +03:00
parent 3040e47a40
commit cc83c1cd0f
25 changed files with 327 additions and 685 deletions

View File

@@ -77,7 +77,6 @@ nsHtml5ElementName::~nsHtml5ElementName()
}
nsHtml5ElementName* nsHtml5ElementName::ELT_ANNOTATION_XML = nullptr;
nsHtml5ElementName* nsHtml5ElementName::ELT_ISINDEX = nullptr;
nsHtml5ElementName* nsHtml5ElementName::ELT_BIG = nullptr;
nsHtml5ElementName* nsHtml5ElementName::ELT_BDO = nullptr;
nsHtml5ElementName* nsHtml5ElementName::ELT_COL = nullptr;
@@ -283,27 +282,27 @@ nsHtml5ElementName* nsHtml5ElementName::ELT_SUMMARY = nullptr;
nsHtml5ElementName* nsHtml5ElementName::ELT_TBODY = nullptr;
nsHtml5ElementName** nsHtml5ElementName::ELEMENT_NAMES = 0;
static int32_t const ELEMENT_HASHES_DATA[] = {
1903302038, 1749656156, 2001349720, 893386754, 1803929812, 1971461414,
2007781534, 59821379, 1733054663, 1756625221, 1870268949, 1941178676,
1986527234, 2005324101, 2068523853, 55104723, 62450211, 1686491348,
1903302038, 1749656156, 2001349704, 893386754, 1803929812, 1968836118,
2007601444, 59821379, 1733054663, 1756625221, 1870268949, 1941178676,
1983633431, 2004635806, 2060065124, 55104723, 62450211, 1686491348,
1747176599, 1751288021, 1783210839, 1853642948, 1884120164, 1914900309,
1967788867, 1982173479, 1998724870, 2001392798, 2006329158, 2008994116,
1967788867, 1973420034, 1998585858, 2001392796, 2006028454, 2008851557,
2085266636, 52485715, 57733651, 60354131, 67633153, 960495618,
1715310660, 1737099991, 1748100148, 1749801286, 1755076808, 1757268168,
1790207270, 1806806678, 1857653029, 1881288348, 1898753862, 1906135367,
1934172497, 1965334268, 1968053806, 1971938532, 1983533124, 1990037800,
2001309869, 2001392795, 2003183333, 2005925890, 2006974466, 2008340774,
2051837468, 2070023911, 2092255447, 51438659, 52488851, 56151587,
1934172497, 1965334268, 1967795958, 1971465813, 1982935782, 1988763672,
1999397992, 2001349736, 2001495140, 2005719336, 2006896969, 2008125638,
2021937364, 2068523856, 2092255447, 51438659, 52488851, 56151587,
59244545, 60347747, 61925907, 63438849, 69730305, 926941186,
1682547543, 1699324759, 1730965751, 1733890180, 1740181637, 1747814436,
1748359220, 1749715159, 1749905526, 1752979652, 1756474198, 1757146773,
1766992520, 1783388498, 1798686984, 1805502724, 1818230786, 1854228698,
1868312196, 1874053333, 1881613047, 1889085973, 1900845386, 1905563974,
1907661127, 1925844629, 1938817026, 1963982850, 1967128578, 1967795958,
1968836118, 1971465813, 1973420034, 1982935782, 1983633431, 1988763672,
1998585858, 1999397992, 2001349704, 2001349736, 2001392796, 2001495140,
2004635806, 2005719336, 2006028454, 2006896969, 2007601444, 2008125638,
2008851557, 2021937364, 2060065124, 2068523856, 2083120164, 2091479332,
1907661127, 1925844629, 1938817026, 1963982850, 1967128578, 1967795910,
1968053806, 1971461414, 1971938532, 1982173479, 1983533124, 1986527234,
1990037800, 1998724870, 2001309869, 2001349720, 2001392795, 2001392798,
2003183333, 2005324101, 2005925890, 2006329158, 2006974466, 2007781534,
2008340774, 2008994116, 2051837468, 2068523853, 2083120164, 2091479332,
2092557349, 51434643, 51961587, 52486755, 52490899, 55110883,
57206291, 58773795, 59768833, 60345171, 60352339, 61395251,
62390273, 62973651, 67108865, 68681729, 876609538, 910163970,
@@ -316,7 +315,7 @@ static int32_t const ELEMENT_HASHES_DATA[] = {
1854245076, 1864368130, 1870135298, 1873281026, 1874102998, 1881498736,
1881669634, 1887579800, 1898223949, 1899272519, 1902641154, 1904412884,
1906087319, 1907435316, 1907959605, 1919418370, 1932928296, 1935549734,
1939219752, 1941221172, 1965115924, 1966223078, 1967760215, 1967795910
1939219752, 1941221172, 1965115924, 1966223078, 1967760215
};
staticJArray<int32_t,int32_t> nsHtml5ElementName::ELEMENT_HASHES = { ELEMENT_HASHES_DATA, MOZ_ARRAY_LENGTH(ELEMENT_HASHES_DATA) };
void
@@ -326,9 +325,6 @@ nsHtml5ElementName::initializeStatics()
nsGkAtoms::annotation_xml_,
nsGkAtoms::annotation_xml_,
nsHtml5TreeBuilder::ANNOTATION_XML | SCOPING_AS_MATHML);
ELT_ISINDEX = new nsHtml5ElementName(nsGkAtoms::isindex,
nsGkAtoms::isindex,
nsHtml5TreeBuilder::ISINDEX | SPECIAL);
ELT_BIG = new nsHtml5ElementName(
nsGkAtoms::big,
nsGkAtoms::big,
@@ -976,22 +972,22 @@ nsHtml5ElementName::initializeStatics()
nsGkAtoms::tbody,
nsHtml5TreeBuilder::TBODY_OR_THEAD_OR_TFOOT |
SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
ELEMENT_NAMES = new nsHtml5ElementName*[204];
ELEMENT_NAMES = new nsHtml5ElementName*[203];
ELEMENT_NAMES[0] = ELT_KEYGEN;
ELEMENT_NAMES[1] = ELT_FETURBULENCE;
ELEMENT_NAMES[2] = ELT_FRAMESET;
ELEMENT_NAMES[2] = ELT_FIELDSET;
ELEMENT_NAMES[3] = ELT_H2;
ELEMENT_NAMES[4] = ELT_MATH;
ELEMENT_NAMES[5] = ELT_MARKER;
ELEMENT_NAMES[6] = ELT_RADIALGRADIENT;
ELEMENT_NAMES[5] = ELT_HEADER;
ELEMENT_NAMES[6] = ELT_RECT;
ELEMENT_NAMES[7] = ELT_RTC;
ELEMENT_NAMES[8] = ELT_FEBLEND;
ELEMENT_NAMES[9] = ELT_STYLE;
ELEMENT_NAMES[10] = ELT_LABEL;
ELEMENT_NAMES[11] = ELT_SAMP;
ELEMENT_NAMES[12] = ELT_MS;
ELEMENT_NAMES[13] = ELT_MTEXT;
ELEMENT_NAMES[14] = ELT_FECOLORMATRIX;
ELEMENT_NAMES[12] = ELT_DETAILS;
ELEMENT_NAMES[13] = ELT_LINEARGRADIENT;
ELEMENT_NAMES[14] = ELT_VIEW;
ELEMENT_NAMES[15] = ELT_IMG;
ELEMENT_NAMES[16] = ELT_WBR;
ELEMENT_NAMES[17] = ELT_META;
@@ -1002,11 +998,11 @@ nsHtml5ElementName::initializeStatics()
ELEMENT_NAMES[22] = ELT_FORM;
ELEMENT_NAMES[23] = ELT_AUDIO;
ELEMENT_NAMES[24] = ELT_FECOMPONENTTRANSFER;
ELEMENT_NAMES[25] = ELT_ADDRESS;
ELEMENT_NAMES[26] = ELT_APPLET;
ELEMENT_NAMES[27] = ELT_FEDISTANTLIGHT;
ELEMENT_NAMES[28] = ELT_OUTPUT;
ELEMENT_NAMES[29] = ELT_TEXT;
ELEMENT_NAMES[25] = ELT_TR;
ELEMENT_NAMES[26] = ELT_DT;
ELEMENT_NAMES[27] = ELT_FEPOINTLIGHT;
ELEMENT_NAMES[28] = ELT_OBJECT;
ELEMENT_NAMES[29] = ELT_TFOOT;
ELEMENT_NAMES[30] = ELT_FEMORPHOLOGY;
ELEMENT_NAMES[31] = ELT_DEL;
ELEMENT_NAMES[32] = ELT_NAV;
@@ -1027,18 +1023,18 @@ nsHtml5ElementName::initializeStatics()
ELEMENT_NAMES[47] = ELT_PATTERN;
ELEMENT_NAMES[48] = ELT_FEDISPLACEMENTMAP;
ELEMENT_NAMES[49] = ELT_ANIMATECOLOR;
ELEMENT_NAMES[50] = ELT_FEGAUSSIANBLUR;
ELEMENT_NAMES[51] = ELT_NOBR;
ELEMENT_NAMES[52] = ELT_DEFS;
ELEMENT_NAMES[53] = ELT_PROGRESS;
ELEMENT_NAMES[54] = ELT_FOREIGNOBJECT;
ELEMENT_NAMES[55] = ELT_FESPOTLIGHT;
ELEMENT_NAMES[56] = ELT_INPUT;
ELEMENT_NAMES[57] = ELT_RT;
ELEMENT_NAMES[58] = ELT_TT;
ELEMENT_NAMES[59] = ELT_SCRIPT;
ELEMENT_NAMES[60] = ELT_FEDROPSHADOW;
ELEMENT_NAMES[61] = ELT_ISINDEX;
ELEMENT_NAMES[50] = ELT_FOOTER;
ELEMENT_NAMES[51] = ELT_METER;
ELEMENT_NAMES[52] = ELT_CANVAS;
ELEMENT_NAMES[53] = ELT_NOFRAMES;
ELEMENT_NAMES[54] = ELT_BASEFONT;
ELEMENT_NAMES[55] = ELT_FEOFFSET;
ELEMENT_NAMES[56] = ELT_FONT;
ELEMENT_NAMES[57] = ELT_NOSCRIPT;
ELEMENT_NAMES[58] = ELT_PLAINTEXT;
ELEMENT_NAMES[59] = ELT_SELECT;
ELEMENT_NAMES[60] = ELT_MENU;
ELEMENT_NAMES[61] = ELT_FECONVOLVEMATRIX;
ELEMENT_NAMES[62] = ELT_SUMMARY;
ELEMENT_NAMES[63] = ELT_BDO;
ELEMENT_NAMES[64] = ELT_DIR;
@@ -1078,29 +1074,29 @@ nsHtml5ElementName::initializeStatics()
ELEMENT_NAMES[98] = ELT_RP;
ELEMENT_NAMES[99] = ELT_BR;
ELEMENT_NAMES[100] = ELT_HR;
ELEMENT_NAMES[101] = ELT_FOOTER;
ELEMENT_NAMES[102] = ELT_HEADER;
ELEMENT_NAMES[103] = ELT_METER;
ELEMENT_NAMES[104] = ELT_TR;
ELEMENT_NAMES[105] = ELT_CANVAS;
ELEMENT_NAMES[106] = ELT_DETAILS;
ELEMENT_NAMES[107] = ELT_NOFRAMES;
ELEMENT_NAMES[108] = ELT_DT;
ELEMENT_NAMES[109] = ELT_BASEFONT;
ELEMENT_NAMES[110] = ELT_FIELDSET;
ELEMENT_NAMES[111] = ELT_FEOFFSET;
ELEMENT_NAMES[112] = ELT_FEPOINTLIGHT;
ELEMENT_NAMES[113] = ELT_FONT;
ELEMENT_NAMES[114] = ELT_LINEARGRADIENT;
ELEMENT_NAMES[115] = ELT_NOSCRIPT;
ELEMENT_NAMES[116] = ELT_OBJECT;
ELEMENT_NAMES[117] = ELT_PLAINTEXT;
ELEMENT_NAMES[118] = ELT_RECT;
ELEMENT_NAMES[119] = ELT_SELECT;
ELEMENT_NAMES[120] = ELT_TFOOT;
ELEMENT_NAMES[121] = ELT_MENU;
ELEMENT_NAMES[122] = ELT_VIEW;
ELEMENT_NAMES[123] = ELT_FECONVOLVEMATRIX;
ELEMENT_NAMES[101] = ELT_FILTER;
ELEMENT_NAMES[102] = ELT_FEGAUSSIANBLUR;
ELEMENT_NAMES[103] = ELT_MARKER;
ELEMENT_NAMES[104] = ELT_NOBR;
ELEMENT_NAMES[105] = ELT_ADDRESS;
ELEMENT_NAMES[106] = ELT_DEFS;
ELEMENT_NAMES[107] = ELT_MS;
ELEMENT_NAMES[108] = ELT_PROGRESS;
ELEMENT_NAMES[109] = ELT_APPLET;
ELEMENT_NAMES[110] = ELT_FOREIGNOBJECT;
ELEMENT_NAMES[111] = ELT_FRAMESET;
ELEMENT_NAMES[112] = ELT_FESPOTLIGHT;
ELEMENT_NAMES[113] = ELT_FEDISTANTLIGHT;
ELEMENT_NAMES[114] = ELT_INPUT;
ELEMENT_NAMES[115] = ELT_MTEXT;
ELEMENT_NAMES[116] = ELT_RT;
ELEMENT_NAMES[117] = ELT_OUTPUT;
ELEMENT_NAMES[118] = ELT_TT;
ELEMENT_NAMES[119] = ELT_RADIALGRADIENT;
ELEMENT_NAMES[120] = ELT_SCRIPT;
ELEMENT_NAMES[121] = ELT_TEXT;
ELEMENT_NAMES[122] = ELT_FEDROPSHADOW;
ELEMENT_NAMES[123] = ELT_FECOLORMATRIX;
ELEMENT_NAMES[124] = ELT_BODY;
ELEMENT_NAMES[125] = ELT_RUBY;
ELEMENT_NAMES[126] = ELT_TBODY;
@@ -1180,14 +1176,12 @@ nsHtml5ElementName::initializeStatics()
ELEMENT_NAMES[200] = ELT_ABBR;
ELEMENT_NAMES[201] = ELT_CENTER;
ELEMENT_NAMES[202] = ELT_FEFUNCR;
ELEMENT_NAMES[203] = ELT_FILTER;
}
void
nsHtml5ElementName::releaseStatics()
{
delete ELT_ANNOTATION_XML;
delete ELT_ISINDEX;
delete ELT_BIG;
delete ELT_BDO;
delete ELT_COL;