Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove our broken attempt to support <plaintext> (which is very very

Browse Source 
deprecated).  Bug 88987, r=jst, sr=dbaron
This commit is contained in:
bzbarsky%mit.edu 2004-10-09 16:55:54 +00:00
parent c5c2f4a92e
commit d2a2b2a6fd
9 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/html/document/src/nsHTMLFragmentContentSink.cpp
View File

@ -595,8 +595,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
}
}
if(nodeType == eHTMLTag_plaintext ||
nodeType == eHTMLTag_script ||
if(nodeType == eHTMLTag_script ||
nodeType == eHTMLTag_style ||
nodeType == eHTMLTag_textarea ||
nodeType == eHTMLTag_xmp) {

2
layout/html/document/src/html.css
View File

@ -139,7 +139,7 @@ listing {
margin: 1em 0;
}
plaintext, xmp, pre {
xmp, pre {
display: block;
font-family: -moz-fixed;
white-space: pre;

2
layout/style/html.css
View File

@ -139,7 +139,7 @@ listing {
margin: 1em 0;
}
plaintext, xmp, pre {
xmp, pre {
display: block;
font-family: -moz-fixed;
white-space: pre;

1
parser/htmlparser/public/nsHTMLTagList.h
View File

@ -140,7 +140,6 @@ HTML_TAG(optgroup, OptGroup)
HTML_TAG(option, Option)
HTML_TAG(p, Paragraph)
HTML_TAG(param, Shared)
HTML_TAG(plaintext, Span)
HTML_TAG(pre, Pre)
HTML_TAG(q, Shared)
HTML_TAG(s, Span)

1
parser/htmlparser/src/CNavDTD.cpp
View File

@ -1065,7 +1065,6 @@ nsresult CNavDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){
}
break;
case eHTMLTag_plaintext:
case eHTMLTag_xmp:
//grab the skipped content and dump it out as text...
{

2
parser/htmlparser/src/COtherElements.h
View File

@ -2345,11 +2345,9 @@ void CElementTable::InitializeElements() {
mDfltElements[eHTMLTag_p].mContainsGroups.mBits.mSelf=0;
CElement::InitializeLeaf( mDfltElements[eHTMLTag_param], eHTMLTag_param, CElement::GetEmptyGroup(), CLeafElement::GetContainedGroups());
CElement::Initialize( mDfltElements[eHTMLTag_plaintext], eHTMLTag_plaintext);
CBlockElement::Initialize( mDfltElements[eHTMLTag_pre], eHTMLTag_pre);
mDfltElements[eHTMLTag_pre].mExcludeKids=kPreExcludeKids;
CElement::Initialize( mDfltElements[eHTMLTag_plaintext], eHTMLTag_plaintext);
CSpecialElement::Initialize( mDfltElements[eHTMLTag_q], eHTMLTag_q);
CFontStyleElement::Initialize( mDfltElements[eHTMLTag_s], eHTMLTag_s);

9
parser/htmlparser/src/nsElementTable.cpp
View File

@ -943,15 +943,6 @@ void InitializeElementTable(void) {
/*special props, prop-range*/ kNonContainer, kNoPropRange,
/*special parents,kids,skip*/ &gParamParents,0,eHTMLTag_unknown);
Initialize(
/*tag*/ eHTMLTag_plaintext,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kExtensions, kFlowEntity, kNone,
/*special props, prop-range*/ kNone,kDefaultPropRange,
/*special parents,kids,skip*/ 0,0,eHTMLTag_plaintext); // Bug 56914
Initialize(
/*tag*/ eHTMLTag_pre,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,

2
parser/htmlparser/src/nsHTMLTags.cpp
View File

@ -199,8 +199,6 @@ static const PRUnichar sHTMLTagUnicodeName_p[] =
{'p', '\0'};
static const PRUnichar sHTMLTagUnicodeName_param[] =
{'p', 'a', 'r', 'a', 'm', '\0'};
static const PRUnichar sHTMLTagUnicodeName_plaintext[] =
{'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_pre[] =
{'p', 'r', 'e', '\0'};
static const PRUnichar sHTMLTagUnicodeName_q[] =

2
parser/htmlparser/src/nsHTMLTokenizer.cpp
View File

@ -740,11 +740,9 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
if(NS_SUCCEEDED(result)) {
CStartToken* theStartToken = NS_STATIC_CAST(CStartToken*,aToken);
//XXX - Find a better soution to record content
//Added _plaintext to fix bug 46054.
if(!(mFlags & NS_IPARSER_FLAG_PRESERVE_CONTENT) &&
(theTag == eHTMLTag_textarea ||
theTag == eHTMLTag_xmp ||
theTag == eHTMLTag_plaintext ||
theTag == eHTMLTag_noscript ||
theTag == eHTMLTag_noframes)) {
NS_ASSERTION(mPreserveTarget == eHTMLTag_unknown,