From dc71142bfce3c9be456b6eddceb2d30cc1ecfb10 Mon Sep 17 00:00:00 2001 From: "rickg%netscape.com" Date: Wed, 25 Nov 1998 02:41:17 +0000 Subject: [PATCH] change Parse(nsString&...) so that an empy string doesn't start process git-svn-id: svn://10.0.0.236/trunk@15285 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/nsParser.cpp | 22 ++++++++++++---------- mozilla/parser/htmlparser/src/nsParser.cpp | 22 ++++++++++++---------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index 81ab783f8a1..9c20c4ddc6a 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -637,18 +637,20 @@ PRInt32 nsParser::Parse(nsString& aSourceBuffer,PRBool anHTMLString,PRBool aVeri PRInt32 result=kNoError; mDTDVerification=aVerifyEnabled; - CParserContext* pc=new CParserContext(new CScanner(aSourceBuffer),&aSourceBuffer,0); + if(0mSourceType="text/html"; - if(eValidDetect==AutoDetectContentType(aSourceBuffer,mParserContext->mSourceType)) { - WillBuildModel(mParserContext->mScanner->GetFilename()); - result=ResumeParse(); - DidBuildModel(result); + PushContext(*pc); + if(PR_TRUE==anHTMLString) + pc->mSourceType="text/html"; + if(eValidDetect==AutoDetectContentType(aSourceBuffer,mParserContext->mSourceType)) { + WillBuildModel(mParserContext->mScanner->GetFilename()); + result=ResumeParse(); + DidBuildModel(result); + } + pc=PopContext(); + delete pc; } - pc=PopContext(); - delete pc; return result; } diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 81ab783f8a1..9c20c4ddc6a 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -637,18 +637,20 @@ PRInt32 nsParser::Parse(nsString& aSourceBuffer,PRBool anHTMLString,PRBool aVeri PRInt32 result=kNoError; mDTDVerification=aVerifyEnabled; - CParserContext* pc=new CParserContext(new CScanner(aSourceBuffer),&aSourceBuffer,0); + if(0mSourceType="text/html"; - if(eValidDetect==AutoDetectContentType(aSourceBuffer,mParserContext->mSourceType)) { - WillBuildModel(mParserContext->mScanner->GetFilename()); - result=ResumeParse(); - DidBuildModel(result); + PushContext(*pc); + if(PR_TRUE==anHTMLString) + pc->mSourceType="text/html"; + if(eValidDetect==AutoDetectContentType(aSourceBuffer,mParserContext->mSourceType)) { + WillBuildModel(mParserContext->mScanner->GetFilename()); + result=ResumeParse(); + DidBuildModel(result); + } + pc=PopContext(); + delete pc; } - pc=PopContext(); - delete pc; return result; }