From 46f4abf94fff21bbda87d007a52205e135d00e87 Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Tue, 17 May 2005 16:27:21 +0000 Subject: [PATCH] bug 294402: Change some unnecessary assertions into warnings. r=brendan sr=bzbarsky a=brendan git-svn-id: svn://10.0.0.236/trunk@173510 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/parser/htmlparser/src/nsParser.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index ebf11b7d9d6..750ed637342 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -1421,9 +1421,8 @@ NS_IMETHODIMP nsParser::Terminate(void) */ NS_IMETHODIMP nsParser::ContinueParsing() { - NS_ASSERTION(!(mFlags & NS_PARSER_FLAG_PARSER_ENABLED), - "Trying to continue parsing on a unblocked parser."); if (mFlags & NS_PARSER_FLAG_PARSER_ENABLED) { + NS_WARNING("Trying to continue parsing on a unblocked parser."); return NS_OK; } @@ -1441,8 +1440,11 @@ NS_IMETHODIMP nsParser::ContinueInterruptedParsing() nsresult result=NS_OK; nsCOMPtr kungFuDeathGrip(this); - NS_ASSERTION(mFlags & NS_PARSER_FLAG_PARSER_ENABLED, - "Don't call ContinueInterruptedParsing on a blocked parser."); +#ifdef DEBUG + if (!(mFlags & NS_PARSER_FLAG_PARSER_ENABLED)) { + NS_WARNING("Don't call ContinueInterruptedParsing on a blocked parser."); + } +#endif PRBool isFinalChunk = (mParserContext && mParserContext->mStreamListenerState==eOnStop) ? @@ -1481,13 +1483,14 @@ NS_IMETHODIMP_(void) nsParser::BlockParser() */ NS_IMETHODIMP_(void) nsParser::UnblockParser() { - NS_ASSERTION(!(mFlags & NS_PARSER_FLAG_PARSER_ENABLED), - "Trying to unblock an unblocked parser."); if (!(mFlags & NS_PARSER_FLAG_PARSER_ENABLED)) { mFlags |= NS_PARSER_FLAG_PARSER_ENABLED; MOZ_TIMER_DEBUGLOG(("Start: Parse Time: nsParser::UnblockParser(), this=%p\n", this)); MOZ_TIMER_START(mParseTime); } + else { + NS_WARNING("Trying to unblock an unblocked parser."); + } } /**