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

Changed Parse to take an nsIStreamListener to pass notifications too; changed parser to pass them on

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2823 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp
1998-06-01 19:51:52 +00:00
parent c11f861455
commit 61a25c7c1d
6 changed files with 80 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/parser/htmlparser/src/nsHTMLParser.cpp
View File

@@ -70,7 +70,7 @@ NS_HTMLPARS nsresult NS_NewHTMLParser(nsIParser** aInstancePtrResult)
return NS_ERROR_OUT_OF_MEMORY;
}
return it->QueryInterface(kClassIID, (void **) aInstancePtrResult);
return it->QueryInterface(kIParserIID, (void **) aInstancePtrResult);
}
@@ -150,6 +150,7 @@ void nsHTMLParser::InitializeDefaultTokenHandlers() {
*/
nsHTMLParser::nsHTMLParser() {
NS_INIT_REFCNT();
mListener = nsnull;
mTransferBuffer=0;
mSink=0;
mContextStackPos=0;
@@ -180,6 +181,7 @@ nsHTMLParser::~nsHTMLParser() {
PL_strfree(gURLRef);
gURLRef = 0;
}
NS_IF_RELEASE(mListener);
if(mTransferBuffer)
delete [] mTransferBuffer;
mTransferBuffer=0;
@@ -647,7 +649,9 @@ PRBool nsHTMLParser::Parse(const char* aFilename,PRBool aIncremental){
* @param aFilename -- const char* containing file to be parsed.
* @return PR_TRUE if parse succeeded, PR_FALSE otherwise.
*/
PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
PRInt32 nsHTMLParser::Parse(nsIURL* aURL,
nsIStreamListener* aListener,
PRBool aIncremental) {
NS_PRECONDITION(0!=aURL,kNullURL);
PRInt32 status=kBadURL;
@@ -655,6 +659,10 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
if(rickGDebug)
return Parse("c:/temp/temp.html",PR_TRUE);
NS_IF_RELEASE(mListener);
mListener = aListener;
NS_IF_ADDREF(aListener);
mIncremental=aIncremental;
mParseMode=DetermineParseMode();
@@ -687,7 +695,7 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
status=ResumeParse();
DidBuildModel(status);
}
}//if
}
}
return status;
}
@@ -1619,8 +1627,14 @@ nsresult nsHTMLParser::GetBindInfo(void){
* @param
* @return
*/
nsresult nsHTMLParser::OnProgress(PRInt32 Progress, PRInt32 ProgressMax, const char *msg){
nsresult
nsHTMLParser::OnProgress(PRInt32 aProgress, PRInt32 aProgressMax,
const char *aMsg)
{
nsresult result=0;
if (nsnull != mListener) {
mListener->OnProgress(aProgress, aProgressMax, aMsg);
}
return result;
}
@@ -1632,6 +1646,9 @@ nsresult nsHTMLParser::OnProgress(PRInt32 Progress, PRInt32 ProgressMax, const c
* @return
*/
nsresult nsHTMLParser::OnStartBinding(void){
if (nsnull != mListener) {
mListener->OnStartBinding();
}
nsresult result=WillBuildModel();
if(!mTransferBuffer) {
mTransferBuffer=new char[gTransferBufferSize+1];
@@ -1648,6 +1665,9 @@ nsresult nsHTMLParser::OnStartBinding(void){
* @return error code (usually 0)
*/
nsresult nsHTMLParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length){
if (nsnull != mListener) {
mListener->OnDataAvailable(pIStream, length);
}
int len=0;
int offset=0;
@@ -1691,6 +1711,9 @@ nsresult nsHTMLParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length)
* @return
*/
nsresult nsHTMLParser::OnStopBinding(PRInt32 status, const char *msg){
if (nsnull != mListener) {
mListener->OnStopBinding(status, msg);
}
nsresult result=DidBuildModel(status);
return result;
}