From 4ceb98d7fd60d57bb2f9e7cfc836847f4066978a Mon Sep 17 00:00:00 2001 From: "rickg%netscape.com" Date: Thu, 23 Dec 1999 01:04:29 +0000 Subject: [PATCH] fixed bug22040 with patch by vidur; r=kmcclusk. Also removed warnings. git-svn-id: svn://10.0.0.236/trunk@56469 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/CNavDTD.cpp | 4 +++- mozilla/htmlparser/src/nsElementTable.cpp | 2 +- mozilla/htmlparser/src/nsParser.cpp | 4 +--- mozilla/parser/htmlparser/src/CNavDTD.cpp | 4 +++- mozilla/parser/htmlparser/src/nsElementTable.cpp | 2 +- mozilla/parser/htmlparser/src/nsParser.cpp | 4 +--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index 5f2c2cc50f9..22126985b6f 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -1389,8 +1389,10 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) { STOP_TIMER(); MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleStartToken(), this=%p\n", this)); - if (mHasOpenMap && mSink) + if (mHasOpenMap && mSink) { result=mSink->AddLeaf(*theNode); + isTokenHandled=PR_TRUE; + } MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleStartToken(), this=%p\n", this)); START_TIMER(); diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp index 5f34c735909..d41b5f652b1 100644 --- a/mozilla/htmlparser/src/nsElementTable.cpp +++ b/mozilla/htmlparser/src/nsElementTable.cpp @@ -1992,7 +1992,7 @@ void nsHTMLElement::DebugDumpMembership(const char* aFilename){ } void nsHTMLElement::DebugDumpContainType(const char* aFilename){ -#define RICKG_DEBUG +//#define RICKG_DEBUG #ifdef RICKG_DEBUG const char* prefix=" "; diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index 7efbd44304b..49459ef6989 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -1491,9 +1491,7 @@ void nsParser::DebugDumpSource(nsOutputStream& aStream) { PRInt32 theIndex=-1; nsITokenizer* theTokenizer=0; - nsresult result=mParserContext->mDTD->GetTokenizer(theTokenizer); - - if(theTokenizer){ + if(NS_SUCCEEDED(mParserContext->mDTD->GetTokenizer(theTokenizer))){ CToken* theToken; while(nsnull != (theToken=theTokenizer->GetTokenAt(++theIndex))) { // theToken->DebugDumpToken(out); diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index 5f2c2cc50f9..22126985b6f 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -1389,8 +1389,10 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) { STOP_TIMER(); MOZ_TIMER_DEBUGLOG(("Stop: Parse Time: CNavDTD::HandleStartToken(), this=%p\n", this)); - if (mHasOpenMap && mSink) + if (mHasOpenMap && mSink) { result=mSink->AddLeaf(*theNode); + isTokenHandled=PR_TRUE; + } MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::HandleStartToken(), this=%p\n", this)); START_TIMER(); diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp index 5f34c735909..d41b5f652b1 100644 --- a/mozilla/parser/htmlparser/src/nsElementTable.cpp +++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp @@ -1992,7 +1992,7 @@ void nsHTMLElement::DebugDumpMembership(const char* aFilename){ } void nsHTMLElement::DebugDumpContainType(const char* aFilename){ -#define RICKG_DEBUG +//#define RICKG_DEBUG #ifdef RICKG_DEBUG const char* prefix=" "; diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 7efbd44304b..49459ef6989 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -1491,9 +1491,7 @@ void nsParser::DebugDumpSource(nsOutputStream& aStream) { PRInt32 theIndex=-1; nsITokenizer* theTokenizer=0; - nsresult result=mParserContext->mDTD->GetTokenizer(theTokenizer); - - if(theTokenizer){ + if(NS_SUCCEEDED(mParserContext->mDTD->GetTokenizer(theTokenizer))){ CToken* theToken; while(nsnull != (theToken=theTokenizer->GetTokenAt(++theIndex))) { // theToken->DebugDumpToken(out);