Backing out timeless's checkin. This wasn't supposed to happen until we branched

git-svn-id: svn://10.0.0.236/trunk@118508 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
harishd%netscape.com
2002-04-09 00:43:00 +00:00
parent fd8fd4a35c
commit 6b93bed21c
58 changed files with 1280 additions and 1372 deletions

View File

@@ -41,7 +41,6 @@
#include "nsReadableUtils.h"
#include "prprf.h"
static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID);
@@ -198,12 +197,6 @@ nsLoggingSink::SetParser(nsIParser* aParser) {
theResult=mSink->SetParser(aParser);
}
NS_IF_RELEASE(mParser);
mParser = aParser;
NS_IF_ADDREF(mParser);
return theResult;
}
@@ -617,16 +610,8 @@ nsLoggingSink::WriteAttributes(const nsIParserNode& aNode) {
}
if (0 != strchr(gSkippedContentTags, aNode.GetNodeType())) {
nsCOMPtr<nsIDTD> dtd;
mParser->GetDTD(getter_AddRefs(dtd));
NS_ENSURE_TRUE(dtd, NS_ERROR_FAILURE);
nsString theString;
PRInt32 lineNo = 0;
dtd->CollectSkippedContent(aNode.GetNodeType(), theString, lineNo);
char* content;
GetNewCString(theString, &content);
GetNewCString(aNode.GetSkippedContent(), &content);
if(content) {
PR_fprintf(mOutput, " <content value=\"");
PR_fprintf(mOutput, "%s\"/>\n", content) ;
@@ -645,14 +630,7 @@ nsLoggingSink::WillWriteAttributes(const nsIParserNode& aNode)
return PR_TRUE;
}
if (0 != strchr(gSkippedContentTags, aNode.GetNodeType())) {
nsCOMPtr<nsIDTD> dtd;
mParser->GetDTD(getter_AddRefs(dtd));
NS_ENSURE_TRUE(dtd, NS_ERROR_FAILURE);
nsString content;
PRInt32 lineNo = 0;
dtd->CollectSkippedContent(aNode.GetNodeType(), content, lineNo);
const nsString& content = aNode.GetSkippedContent();
if (content.Length() > 0) {
return PR_TRUE;
}