Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

56501 - Serializer changes in dealing with NOSCRIPT ( checkin for jst )

Browse Source 
r=me
sr=scc


git-svn-id: svn://10.0.0.236/trunk@81236 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
harishd%netscape.com
2000-10-15 17:33:11 +00:00
parent 91787aebed
commit 213c0b36dc
7 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/content/base/src/nsHTMLContentSerializer.cpp
View File

@@ -62,7 +62,7 @@ nsHTMLContentSerializer::nsHTMLContentSerializer()
mColPos = 0;
mIndent = 0;
mInBody = PR_FALSE;
mInScriptOrStyle = PR_FALSE;
mInCDATA = PR_FALSE;
}
nsHTMLContentSerializer::~nsHTMLContentSerializer()
@@ -269,8 +269,9 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement,
}
if ((name.get() == nsHTMLAtoms::script) ||
(name.get() == nsHTMLAtoms::style)) {
mInScriptOrStyle = PR_TRUE;
(name.get() == nsHTMLAtoms::style) ||
(name.get() == nsHTMLAtoms::noscript)) {
mInCDATA = PR_TRUE;
}
return NS_OK;
@@ -302,10 +303,7 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement,
nsCOMPtr<nsIParserService> parserService;
GetParserService(getter_AddRefs(parserService));
if ((name.get() == nsHTMLAtoms::script) ||
(name.get() == nsHTMLAtoms::style)) {
mInScriptOrStyle = PR_FALSE;
} else if (parserService) {
if (parserService && (name.get() != nsHTMLAtoms::style)) {
nsAutoString nameStr(sharedName);
PRBool isContainer;
PRInt32 id;
@@ -331,6 +329,8 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement,
mColPos = 0;
}
mInCDATA = PR_FALSE;
return NS_OK;
}
@@ -488,7 +488,7 @@ nsHTMLContentSerializer::AppendToString(const nsAReadableString& aStr,
mColPos += aStr.Length();
}
if (aTranslateEntities && !mInScriptOrStyle) {
if (aTranslateEntities && !mInCDATA) {
if (mFlags & nsIDocumentEncoder::OutputEncodeEntities) {
nsCOMPtr<nsIParserService> parserService;
GetParserService(getter_AddRefs(parserService));