From 4fd4a3d9c649a4501708ac91c16b6ecbcb398d33 Mon Sep 17 00:00:00 2001 From: "jkeiser%netscape.com" Date: Thu, 9 May 2002 02:33:34 +0000 Subject: [PATCH] Treat NOLAYER like any undeclared tag (from Antonio Xu). Bug 61443, r=harishd@netscape.com, sr=jst@netscape.com git-svn-id: svn://10.0.0.236/trunk@121143 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/html/document/src/nsHTMLContentSink.cpp | 1 - mozilla/htmlparser/public/nsHTMLTagList.h | 1 - mozilla/htmlparser/src/COtherElements.h | 1 - mozilla/htmlparser/src/nsElementTable.cpp | 13 ++----------- mozilla/htmlparser/src/nsHTMLTags.cpp | 2 -- mozilla/parser/htmlparser/public/nsHTMLTagList.h | 1 - mozilla/parser/htmlparser/src/COtherElements.h | 1 - mozilla/parser/htmlparser/src/nsElementTable.cpp | 13 ++----------- mozilla/parser/htmlparser/src/nsHTMLTags.cpp | 2 -- 9 files changed, 4 insertions(+), 31 deletions(-) diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index ff6eb130591..2936526596e 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -1250,7 +1250,6 @@ MakeContentObject(nsHTMLTag aNodeType, break; case eHTMLTag_layer: case eHTMLTag_ilayer: - case eHTMLTag_nolayer: case eHTMLTag_unknown: case eHTMLTag_userdefined: rv = NS_NewHTMLUnknownElement(aResult, aNodeInfo); diff --git a/mozilla/htmlparser/public/nsHTMLTagList.h b/mozilla/htmlparser/public/nsHTMLTagList.h index ff833da7e43..75766cffbae 100644 --- a/mozilla/htmlparser/public/nsHTMLTagList.h +++ b/mozilla/htmlparser/public/nsHTMLTagList.h @@ -130,7 +130,6 @@ HTML_TAG(multicol) HTML_TAG(nobr) HTML_TAG(noembed) HTML_TAG(noframes) -HTML_TAG(nolayer) HTML_TAG(noscript) HTML_TAG(object) HTML_TAG(ol) diff --git a/mozilla/htmlparser/src/COtherElements.h b/mozilla/htmlparser/src/COtherElements.h index d874c25d748..1824ef0d487 100644 --- a/mozilla/htmlparser/src/COtherElements.h +++ b/mozilla/htmlparser/src/COtherElements.h @@ -2256,7 +2256,6 @@ void CElementTable::InitializeElements() { CElement::Initialize( mDfltElements[eHTMLTag_noembed], eHTMLTag_noembed); CElement::Initialize( mDfltElements[eHTMLTag_noframes], eHTMLTag_noframes, CBlockElement::GetGroup(), CFlowElement::GetContainedGroups()); - CElement::Initialize( mDfltElements[eHTMLTag_nolayer], eHTMLTag_nolayer); CElement::Initialize( mDfltElements[eHTMLTag_noscript], eHTMLTag_noscript, CBlockElement::GetGroup(), CFlowElement::GetContainedGroups()); CElement::Initialize( mDfltElements[eHTMLTag_object], eHTMLTag_object, CBlockElement::GetGroup(), CFlowElement::GetContainedGroups()); diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp index d6523b2bf87..97ac458d40a 100644 --- a/mozilla/htmlparser/src/nsElementTable.cpp +++ b/mozilla/htmlparser/src/nsElementTable.cpp @@ -85,8 +85,8 @@ TagList gContainsOpts={3,{eHTMLTag_option,eHTMLTag_optgroup,eHTMLTag_script}}; TagList gContainsParam={1,{eHTMLTag_param}}; TagList gColgroupKids={1,{eHTMLTag_col}}; TagList gAddressKids={1,{eHTMLTag_p}}; -TagList gBodyKids={9, {eHTMLTag_dd,eHTMLTag_del,eHTMLTag_dt,eHTMLTag_ins, - eHTMLTag_noscript,eHTMLTag_nolayer,eHTMLTag_script,eHTMLTag_li,eHTMLTag_param}}; // Added PARAM for bug 54448 +TagList gBodyKids={8, {eHTMLTag_dd,eHTMLTag_del,eHTMLTag_dt,eHTMLTag_ins, + eHTMLTag_noscript,eHTMLTag_script,eHTMLTag_li,eHTMLTag_param}}; // Added PARAM for bug 54448 TagList gButtonKids={2,{eHTMLTag_caption,eHTMLTag_legend}}; TagList gDLRootTags={5,{eHTMLTag_body,eHTMLTag_td,eHTMLTag_table,eHTMLTag_applet,eHTMLTag_dd}}; @@ -875,15 +875,6 @@ void InitializeElementTable(void) { /*special props, prop-range*/ 0, kNoPropRange, /*special parents,kids,skip*/ &gNoframeRoot,0,eHTMLTag_unknown); - Initialize( - /*tag*/ eHTMLTag_nolayer, - /*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*/ kRequiresBody, kNoPropRange, - /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown); - Initialize( /*tag*/ eHTMLTag_noscript, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, diff --git a/mozilla/htmlparser/src/nsHTMLTags.cpp b/mozilla/htmlparser/src/nsHTMLTags.cpp index 405def95407..810ac7a41bd 100644 --- a/mozilla/htmlparser/src/nsHTMLTags.cpp +++ b/mozilla/htmlparser/src/nsHTMLTags.cpp @@ -187,8 +187,6 @@ static const PRUnichar sHTMLTagUnicodeName_noembed[] = {'n', 'o', 'e', 'm', 'b', 'e', 'd', '\0'}; static const PRUnichar sHTMLTagUnicodeName_noframes[] = {'n', 'o', 'f', 'r', 'a', 'm', 'e', 's', '\0'}; -static const PRUnichar sHTMLTagUnicodeName_nolayer[] = - {'n', 'o', 'l', 'a', 'y', 'e', 'r', '\0'}; static const PRUnichar sHTMLTagUnicodeName_noscript[] = {'n', 'o', 's', 'c', 'r', 'i', 'p', 't', '\0'}; static const PRUnichar sHTMLTagUnicodeName_object[] = diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h index ff833da7e43..75766cffbae 100644 --- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h +++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h @@ -130,7 +130,6 @@ HTML_TAG(multicol) HTML_TAG(nobr) HTML_TAG(noembed) HTML_TAG(noframes) -HTML_TAG(nolayer) HTML_TAG(noscript) HTML_TAG(object) HTML_TAG(ol) diff --git a/mozilla/parser/htmlparser/src/COtherElements.h b/mozilla/parser/htmlparser/src/COtherElements.h index d874c25d748..1824ef0d487 100644 --- a/mozilla/parser/htmlparser/src/COtherElements.h +++ b/mozilla/parser/htmlparser/src/COtherElements.h @@ -2256,7 +2256,6 @@ void CElementTable::InitializeElements() { CElement::Initialize( mDfltElements[eHTMLTag_noembed], eHTMLTag_noembed); CElement::Initialize( mDfltElements[eHTMLTag_noframes], eHTMLTag_noframes, CBlockElement::GetGroup(), CFlowElement::GetContainedGroups()); - CElement::Initialize( mDfltElements[eHTMLTag_nolayer], eHTMLTag_nolayer); CElement::Initialize( mDfltElements[eHTMLTag_noscript], eHTMLTag_noscript, CBlockElement::GetGroup(), CFlowElement::GetContainedGroups()); CElement::Initialize( mDfltElements[eHTMLTag_object], eHTMLTag_object, CBlockElement::GetGroup(), CFlowElement::GetContainedGroups()); diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp index d6523b2bf87..97ac458d40a 100644 --- a/mozilla/parser/htmlparser/src/nsElementTable.cpp +++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp @@ -85,8 +85,8 @@ TagList gContainsOpts={3,{eHTMLTag_option,eHTMLTag_optgroup,eHTMLTag_script}}; TagList gContainsParam={1,{eHTMLTag_param}}; TagList gColgroupKids={1,{eHTMLTag_col}}; TagList gAddressKids={1,{eHTMLTag_p}}; -TagList gBodyKids={9, {eHTMLTag_dd,eHTMLTag_del,eHTMLTag_dt,eHTMLTag_ins, - eHTMLTag_noscript,eHTMLTag_nolayer,eHTMLTag_script,eHTMLTag_li,eHTMLTag_param}}; // Added PARAM for bug 54448 +TagList gBodyKids={8, {eHTMLTag_dd,eHTMLTag_del,eHTMLTag_dt,eHTMLTag_ins, + eHTMLTag_noscript,eHTMLTag_script,eHTMLTag_li,eHTMLTag_param}}; // Added PARAM for bug 54448 TagList gButtonKids={2,{eHTMLTag_caption,eHTMLTag_legend}}; TagList gDLRootTags={5,{eHTMLTag_body,eHTMLTag_td,eHTMLTag_table,eHTMLTag_applet,eHTMLTag_dd}}; @@ -875,15 +875,6 @@ void InitializeElementTable(void) { /*special props, prop-range*/ 0, kNoPropRange, /*special parents,kids,skip*/ &gNoframeRoot,0,eHTMLTag_unknown); - Initialize( - /*tag*/ eHTMLTag_nolayer, - /*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*/ kRequiresBody, kNoPropRange, - /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown); - Initialize( /*tag*/ eHTMLTag_noscript, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp index 405def95407..810ac7a41bd 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp @@ -187,8 +187,6 @@ static const PRUnichar sHTMLTagUnicodeName_noembed[] = {'n', 'o', 'e', 'm', 'b', 'e', 'd', '\0'}; static const PRUnichar sHTMLTagUnicodeName_noframes[] = {'n', 'o', 'f', 'r', 'a', 'm', 'e', 's', '\0'}; -static const PRUnichar sHTMLTagUnicodeName_nolayer[] = - {'n', 'o', 'l', 'a', 'y', 'e', 'r', '\0'}; static const PRUnichar sHTMLTagUnicodeName_noscript[] = {'n', 'o', 's', 'c', 'r', 'i', 'p', 't', '\0'}; static const PRUnichar sHTMLTagUnicodeName_object[] =