From f03d0cf1995a0462b2d678323c0cf85196ff197e Mon Sep 17 00:00:00 2001 From: "harishd%netscape.com" Date: Mon, 9 Dec 2002 19:30:10 +0000 Subject: [PATCH] Backing out fix for bug 149887 because of bug 184029. a=asa git-svn-id: svn://10.0.0.236/trunk@134995 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/CNavDTD.cpp | 1 - mozilla/htmlparser/src/nsElementTable.cpp | 4 +--- mozilla/parser/htmlparser/src/CNavDTD.cpp | 1 - mozilla/parser/htmlparser/src/nsElementTable.cpp | 4 +--- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index 4144d85c422..f007a0f59be 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -837,7 +837,6 @@ nsresult CNavDTD::HandleToken(CToken* aToken,nsIParser* aParser){ switch(theTag) { case eHTMLTag_html: - case eHTMLTag_iframe: case eHTMLTag_noframes: case eHTMLTag_noscript: case eHTMLTag_script: diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp index afc73b3a110..e11b420a976 100644 --- a/mozilla/htmlparser/src/nsElementTable.cpp +++ b/mozilla/htmlparser/src/nsElementTable.cpp @@ -98,9 +98,7 @@ TagList gFontKids={3,{eHTMLTag_legend,eHTMLTag_table,eHTMLTag_text}}; // Added TagList gFormKids={1,{eHTMLTag_keygen}}; TagList gFramesetKids={3,{eHTMLTag_frame,eHTMLTag_frameset,eHTMLTag_noframes}}; -TagList gHtmlKids={10,{eHTMLTag_body,eHTMLTag_frameset,eHTMLTag_head, eHTMLTag_map, - eHTMLTag_noscript,eHTMLTag_noframes, eHTMLTag_script,eHTMLTag_newline, - eHTMLTag_whitespace, eHTMLTag_iframe}}; // Added iframe to fix bug 149887 +TagList gHtmlKids={9,{eHTMLTag_body,eHTMLTag_frameset,eHTMLTag_head,eHTMLTag_map,eHTMLTag_noscript,eHTMLTag_noframes,eHTMLTag_script,eHTMLTag_newline,eHTMLTag_whitespace}}; TagList gHeadKids={8,{eHTMLTag_base,eHTMLTag_bgsound,eHTMLTag_link,eHTMLTag_meta,eHTMLTag_script,eHTMLTag_style,eHTMLTag_title,eHTMLTag_noembed}}; TagList gLabelKids={1,{eHTMLTag_span}}; diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index 4144d85c422..f007a0f59be 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -837,7 +837,6 @@ nsresult CNavDTD::HandleToken(CToken* aToken,nsIParser* aParser){ switch(theTag) { case eHTMLTag_html: - case eHTMLTag_iframe: case eHTMLTag_noframes: case eHTMLTag_noscript: case eHTMLTag_script: diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp index afc73b3a110..e11b420a976 100644 --- a/mozilla/parser/htmlparser/src/nsElementTable.cpp +++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp @@ -98,9 +98,7 @@ TagList gFontKids={3,{eHTMLTag_legend,eHTMLTag_table,eHTMLTag_text}}; // Added TagList gFormKids={1,{eHTMLTag_keygen}}; TagList gFramesetKids={3,{eHTMLTag_frame,eHTMLTag_frameset,eHTMLTag_noframes}}; -TagList gHtmlKids={10,{eHTMLTag_body,eHTMLTag_frameset,eHTMLTag_head, eHTMLTag_map, - eHTMLTag_noscript,eHTMLTag_noframes, eHTMLTag_script,eHTMLTag_newline, - eHTMLTag_whitespace, eHTMLTag_iframe}}; // Added iframe to fix bug 149887 +TagList gHtmlKids={9,{eHTMLTag_body,eHTMLTag_frameset,eHTMLTag_head,eHTMLTag_map,eHTMLTag_noscript,eHTMLTag_noframes,eHTMLTag_script,eHTMLTag_newline,eHTMLTag_whitespace}}; TagList gHeadKids={8,{eHTMLTag_base,eHTMLTag_bgsound,eHTMLTag_link,eHTMLTag_meta,eHTMLTag_script,eHTMLTag_style,eHTMLTag_title,eHTMLTag_noembed}}; TagList gLabelKids={1,{eHTMLTag_span}};