зеркало из https://github.com/mozilla/pjs.git
bug 143168:remove ilayer layer tag from mozilla code
r=harishd, sr=jst Check in for Jerry Tan(jerry.tan@sun.com)'s fix
This commit is contained in:
Родитель
b2e3c3341d
Коммит
2cd0854dba
|
@ -1248,8 +1248,6 @@ MakeContentObject(nsHTMLTag aNodeType,
|
|||
case eHTMLTag_wbr:
|
||||
rv = NS_NewHTMLWBRElement(aResult, aNodeInfo);
|
||||
break;
|
||||
case eHTMLTag_layer:
|
||||
case eHTMLTag_ilayer:
|
||||
case eHTMLTag_unknown:
|
||||
case eHTMLTag_userdefined:
|
||||
rv = NS_NewHTMLUnknownElement(aResult, aNodeInfo);
|
||||
|
|
|
@ -109,7 +109,6 @@ HTML_TAG(hr)
|
|||
HTML_TAG(html)
|
||||
HTML_TAG(i)
|
||||
HTML_TAG(iframe)
|
||||
HTML_TAG(ilayer)
|
||||
HTML_TAG(image)
|
||||
HTML_TAG(img)
|
||||
HTML_TAG(input)
|
||||
|
@ -118,7 +117,6 @@ HTML_TAG(isindex)
|
|||
HTML_TAG(kbd)
|
||||
HTML_TAG(keygen)
|
||||
HTML_TAG(label)
|
||||
HTML_TAG(layer)
|
||||
HTML_TAG(legend)
|
||||
HTML_TAG(li)
|
||||
HTML_TAG(link)
|
||||
|
|
|
@ -62,7 +62,7 @@ enum nsHTMLTag {
|
|||
};
|
||||
#undef HTML_TAG
|
||||
|
||||
// Currently there are 112 HTML tags. eHTMLTag_text = 114.
|
||||
// Currently there are 110 HTML tags. eHTMLTag_text = 112.
|
||||
#define NS_HTML_TAG_MAX PRInt32(eHTMLTag_text - 1)
|
||||
|
||||
class nsHTMLTags {
|
||||
|
|
|
@ -2217,7 +2217,6 @@ void CElementTable::InitializeElements() {
|
|||
CElement::Initialize( mDfltElements[eHTMLTag_iframe], eHTMLTag_iframe, CSpecialElement::GetGroup(), CFlowElement::GetContainedGroups());
|
||||
mDfltElements[eHTMLTag_iframe].mGroup.mBits.mBlock=1; //make this a member of the block group.
|
||||
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_ilayer], eHTMLTag_ilayer);
|
||||
CElement::InitializeLeaf( mDfltElements[eHTMLTag_img], eHTMLTag_img, CSpecialElement::GetGroup(), CLeafElement::GetContainedGroups());
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_image], eHTMLTag_image);
|
||||
CElement::InitializeLeaf( mDfltElements[eHTMLTag_input], eHTMLTag_input, CFormControlElement::GetGroup(),CLeafElement::GetContainedGroups());
|
||||
|
@ -2232,7 +2231,6 @@ void CElementTable::InitializeElements() {
|
|||
CElement::Initialize( mDfltElements[eHTMLTag_label], eHTMLTag_label, CFormControlElement::GetGroup(), CInlineElement::GetContainedGroups());
|
||||
mDfltElements[eHTMLTag_label].mContainsGroups.mBits.mSelf=0;
|
||||
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_layer], eHTMLTag_layer);
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_legend], eHTMLTag_legend, CElement::GetEmptyGroup(), CInlineElement::GetContainedGroups());
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_li], eHTMLTag_li, CListElement::GetGroup(), CFlowElement::GetContainedGroups());
|
||||
mDfltElements[eHTMLTag_li].mExcludeKids=kLIExcludeKids;
|
||||
|
|
|
@ -684,15 +684,6 @@ void InitializeElementTable(void) {
|
|||
/*special props, prop-range*/ kNoStyleLeaksIn, kNoPropRange,
|
||||
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_ilayer,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,0,
|
||||
/*parent,incl,exclgroups*/ kBlock, kFlowEntity, kNone,
|
||||
/*special props, prop-range*/ kNoStyleLeaksIn, kNoPropRange,
|
||||
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_image,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
|
@ -765,15 +756,6 @@ void InitializeElementTable(void) {
|
|||
/*special props, prop-range*/ 0,kDefaultPropRange,
|
||||
/*special parents,kids,skip*/ 0,&gLabelKids,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_layer,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,0,
|
||||
/*parent,incl,exclgroups*/ kBlock, kFlowEntity|kSelf, kSelf,
|
||||
/*special props, prop-range*/ 0,kDefaultPropRange,
|
||||
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_legend,
|
||||
/*requiredAncestor*/ eHTMLTag_fieldset,eHTMLTag_unknown,
|
||||
|
|
|
@ -145,8 +145,6 @@ static const PRUnichar sHTMLTagUnicodeName_i[] =
|
|||
{'i', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_iframe[] =
|
||||
{'i', 'f', 'r', 'a', 'm', 'e', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_ilayer[] =
|
||||
{'i', 'l', 'a', 'y', 'e', 'r', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_image[] =
|
||||
{'i', 'm', 'a', 'g', 'e', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_img[] =
|
||||
|
@ -163,8 +161,6 @@ static const PRUnichar sHTMLTagUnicodeName_keygen[] =
|
|||
{'k', 'e', 'y', 'g', 'e', 'n', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_label[] =
|
||||
{'l', 'a', 'b', 'e', 'l', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_layer[] =
|
||||
{'l', 'a', 'y', 'e', 'r', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_legend[] =
|
||||
{'l', 'e', 'g', 'e', 'n', 'd', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_li[] =
|
||||
|
|
|
@ -109,7 +109,6 @@ HTML_TAG(hr)
|
|||
HTML_TAG(html)
|
||||
HTML_TAG(i)
|
||||
HTML_TAG(iframe)
|
||||
HTML_TAG(ilayer)
|
||||
HTML_TAG(image)
|
||||
HTML_TAG(img)
|
||||
HTML_TAG(input)
|
||||
|
@ -118,7 +117,6 @@ HTML_TAG(isindex)
|
|||
HTML_TAG(kbd)
|
||||
HTML_TAG(keygen)
|
||||
HTML_TAG(label)
|
||||
HTML_TAG(layer)
|
||||
HTML_TAG(legend)
|
||||
HTML_TAG(li)
|
||||
HTML_TAG(link)
|
||||
|
|
|
@ -62,7 +62,7 @@ enum nsHTMLTag {
|
|||
};
|
||||
#undef HTML_TAG
|
||||
|
||||
// Currently there are 112 HTML tags. eHTMLTag_text = 114.
|
||||
// Currently there are 110 HTML tags. eHTMLTag_text = 112.
|
||||
#define NS_HTML_TAG_MAX PRInt32(eHTMLTag_text - 1)
|
||||
|
||||
class nsHTMLTags {
|
||||
|
|
|
@ -2217,7 +2217,6 @@ void CElementTable::InitializeElements() {
|
|||
CElement::Initialize( mDfltElements[eHTMLTag_iframe], eHTMLTag_iframe, CSpecialElement::GetGroup(), CFlowElement::GetContainedGroups());
|
||||
mDfltElements[eHTMLTag_iframe].mGroup.mBits.mBlock=1; //make this a member of the block group.
|
||||
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_ilayer], eHTMLTag_ilayer);
|
||||
CElement::InitializeLeaf( mDfltElements[eHTMLTag_img], eHTMLTag_img, CSpecialElement::GetGroup(), CLeafElement::GetContainedGroups());
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_image], eHTMLTag_image);
|
||||
CElement::InitializeLeaf( mDfltElements[eHTMLTag_input], eHTMLTag_input, CFormControlElement::GetGroup(),CLeafElement::GetContainedGroups());
|
||||
|
@ -2232,7 +2231,6 @@ void CElementTable::InitializeElements() {
|
|||
CElement::Initialize( mDfltElements[eHTMLTag_label], eHTMLTag_label, CFormControlElement::GetGroup(), CInlineElement::GetContainedGroups());
|
||||
mDfltElements[eHTMLTag_label].mContainsGroups.mBits.mSelf=0;
|
||||
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_layer], eHTMLTag_layer);
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_legend], eHTMLTag_legend, CElement::GetEmptyGroup(), CInlineElement::GetContainedGroups());
|
||||
CElement::Initialize( mDfltElements[eHTMLTag_li], eHTMLTag_li, CListElement::GetGroup(), CFlowElement::GetContainedGroups());
|
||||
mDfltElements[eHTMLTag_li].mExcludeKids=kLIExcludeKids;
|
||||
|
|
|
@ -684,15 +684,6 @@ void InitializeElementTable(void) {
|
|||
/*special props, prop-range*/ kNoStyleLeaksIn, kNoPropRange,
|
||||
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_ilayer,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,0,
|
||||
/*parent,incl,exclgroups*/ kBlock, kFlowEntity, kNone,
|
||||
/*special props, prop-range*/ kNoStyleLeaksIn, kNoPropRange,
|
||||
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_image,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
|
@ -765,15 +756,6 @@ void InitializeElementTable(void) {
|
|||
/*special props, prop-range*/ 0,kDefaultPropRange,
|
||||
/*special parents,kids,skip*/ 0,&gLabelKids,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_layer,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,0,
|
||||
/*parent,incl,exclgroups*/ kBlock, kFlowEntity|kSelf, kSelf,
|
||||
/*special props, prop-range*/ 0,kDefaultPropRange,
|
||||
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
|
||||
|
||||
Initialize(
|
||||
/*tag*/ eHTMLTag_legend,
|
||||
/*requiredAncestor*/ eHTMLTag_fieldset,eHTMLTag_unknown,
|
||||
|
|
|
@ -145,8 +145,6 @@ static const PRUnichar sHTMLTagUnicodeName_i[] =
|
|||
{'i', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_iframe[] =
|
||||
{'i', 'f', 'r', 'a', 'm', 'e', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_ilayer[] =
|
||||
{'i', 'l', 'a', 'y', 'e', 'r', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_image[] =
|
||||
{'i', 'm', 'a', 'g', 'e', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_img[] =
|
||||
|
@ -163,8 +161,6 @@ static const PRUnichar sHTMLTagUnicodeName_keygen[] =
|
|||
{'k', 'e', 'y', 'g', 'e', 'n', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_label[] =
|
||||
{'l', 'a', 'b', 'e', 'l', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_layer[] =
|
||||
{'l', 'a', 'y', 'e', 'r', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_legend[] =
|
||||
{'l', 'e', 'g', 'e', 'n', 'd', '\0'};
|
||||
static const PRUnichar sHTMLTagUnicodeName_li[] =
|
||||
|
|
Загрузка…
Ссылка в новой задаче