Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed SetContentSink to do proper ref counting

Browse Source
This commit is contained in:
peterl 1998-04-16 21:48:02 +00:00
parent 355fcae2bd
commit ea431d657f
6 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htmlparser/src/nsHTMLParser.cpp
View File

@ -31,6 +31,7 @@
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kClassIID, NS_IHTML_PARSER_IID); static NS_DEFINE_IID(kClassIID, NS_IHTML_PARSER_IID);
static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTMLCONTENTSINK_IID);
/**------------------------------------------------------- /**-------------------------------------------------------
@ -107,6 +108,7 @@ nsHTMLParser::~nsHTMLParser() {
if(mDTD) if(mDTD)
delete mDTD; delete mDTD;
mDTD=0; mDTD=0;
NS_IF_RELEASE(mSink);
} }
@ -270,13 +272,20 @@ CDefaultTokenHandler* nsHTMLParser::AddTokenHandler(CDefaultTokenHandler* aHandl
* @param nsIContentSink interface for node receiver * @param nsIContentSink interface for node receiver
* @return * @return
*------------------------------------------------------*/ *------------------------------------------------------*/
nsIContentSink* nsHTMLParser::SetContentSink(nsIContentSink* aSink) { void nsHTMLParser::SetContentSink(nsIContentSink* aSink) {
NS_PRECONDITION(0!=aSink,"sink cannot be null!"); NS_PRECONDITION(0!=aSink,"sink cannot be null!");
nsIContentSink* old=mSink;
if(aSink) { if(aSink) {
mSink=(nsHTMLContentSink*)(aSink); nsIHTMLContentSink* htmlSink;
if (NS_OK == aSink->QueryInterface(kIHTMLContentSinkIID, (void**)&htmlSink)) {
if ((nsHTMLContentSink*)(htmlSink) != mSink) {
NS_IF_RELEASE(mSink);
mSink = (nsHTMLContentSink*)(htmlSink);
}
else {
NS_RELEASE(htmlSink);
}
}
} }
return old;
} }
/**------------------------------------------------------- /**-------------------------------------------------------
@ -301,7 +310,7 @@ PRBool nsHTMLParser::Parse(nsIURL* aURL){
mTokenizer=new CTokenizer(aURL, delegate); mTokenizer=new CTokenizer(aURL, delegate);
mTokenizer->Tokenize(); mTokenizer->Tokenize();
#define VERBOSE_DEBUG //#define VERBOSE_DEBUG
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
mTokenizer->DebugDumpTokens(cout); mTokenizer->DebugDumpTokens(cout);
#endif #endif

2
htmlparser/src/nsHTMLParser.h
View File

@ -82,7 +82,7 @@ friend class CDefaultTokenHandler;
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
nsHTMLParser(); nsHTMLParser();
~nsHTMLParser(); ~nsHTMLParser();
virtual nsIContentSink* SetContentSink(nsIContentSink* aSink); virtual void SetContentSink(nsIContentSink* aSink);
virtual PRBool Parse(nsIURL* aURL); virtual PRBool Parse(nsIURL* aURL);
virtual PRBool ResumeParse(); virtual PRBool ResumeParse();

2
htmlparser/src/nsIParser.h
View File

@ -51,7 +51,7 @@ class nsIParser : public nsISupports {
public: public:
virtual nsIContentSink* SetContentSink(nsIContentSink* aContentSink)=0; virtual void SetContentSink(nsIContentSink* aContentSink)=0;
virtual PRBool Parse(nsIURL* aURL)=0; virtual PRBool Parse(nsIURL* aURL)=0;
virtual PRBool ResumeParse()=0; virtual PRBool ResumeParse()=0;
}; };

19
parser/htmlparser/src/nsHTMLParser.cpp
View File

@ -31,6 +31,7 @@
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kClassIID, NS_IHTML_PARSER_IID); static NS_DEFINE_IID(kClassIID, NS_IHTML_PARSER_IID);
static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTMLCONTENTSINK_IID);
/**------------------------------------------------------- /**-------------------------------------------------------
@ -107,6 +108,7 @@ nsHTMLParser::~nsHTMLParser() {
if(mDTD) if(mDTD)
delete mDTD; delete mDTD;
mDTD=0; mDTD=0;
NS_IF_RELEASE(mSink);
} }
@ -270,13 +272,20 @@ CDefaultTokenHandler* nsHTMLParser::AddTokenHandler(CDefaultTokenHandler* aHandl
* @param nsIContentSink interface for node receiver * @param nsIContentSink interface for node receiver
* @return * @return
*------------------------------------------------------*/ *------------------------------------------------------*/
nsIContentSink* nsHTMLParser::SetContentSink(nsIContentSink* aSink) { void nsHTMLParser::SetContentSink(nsIContentSink* aSink) {
NS_PRECONDITION(0!=aSink,"sink cannot be null!"); NS_PRECONDITION(0!=aSink,"sink cannot be null!");
nsIContentSink* old=mSink;
if(aSink) { if(aSink) {
mSink=(nsHTMLContentSink*)(aSink); nsIHTMLContentSink* htmlSink;
if (NS_OK == aSink->QueryInterface(kIHTMLContentSinkIID, (void**)&htmlSink)) {
if ((nsHTMLContentSink*)(htmlSink) != mSink) {
NS_IF_RELEASE(mSink);
mSink = (nsHTMLContentSink*)(htmlSink);
}
else {
NS_RELEASE(htmlSink);
}
}
} }
return old;
} }
/**------------------------------------------------------- /**-------------------------------------------------------
@ -301,7 +310,7 @@ PRBool nsHTMLParser::Parse(nsIURL* aURL){
mTokenizer=new CTokenizer(aURL, delegate); mTokenizer=new CTokenizer(aURL, delegate);
mTokenizer->Tokenize(); mTokenizer->Tokenize();
#define VERBOSE_DEBUG //#define VERBOSE_DEBUG
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
mTokenizer->DebugDumpTokens(cout); mTokenizer->DebugDumpTokens(cout);
#endif #endif

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

@ -82,7 +82,7 @@ friend class CDefaultTokenHandler;
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
nsHTMLParser(); nsHTMLParser();
~nsHTMLParser(); ~nsHTMLParser();
virtual nsIContentSink* SetContentSink(nsIContentSink* aSink); virtual void SetContentSink(nsIContentSink* aSink);
virtual PRBool Parse(nsIURL* aURL); virtual PRBool Parse(nsIURL* aURL);
virtual PRBool ResumeParse(); virtual PRBool ResumeParse();

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

@ -51,7 +51,7 @@ class nsIParser : public nsISupports {
public: public:
virtual nsIContentSink* SetContentSink(nsIContentSink* aContentSink)=0; virtual void SetContentSink(nsIContentSink* aContentSink)=0;
virtual PRBool Parse(nsIURL* aURL)=0; virtual PRBool Parse(nsIURL* aURL)=0;
virtual PRBool ResumeParse()=0; virtual PRBool ResumeParse()=0;
}; };