final factoring of DTDs, and removal of nsHTMLDTD.*
git-svn-id: svn://10.0.0.236/trunk@537 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -363,7 +363,7 @@ PRBool nsHTMLParser::IterateTokens() {
|
||||
//later you have to Handle them, because they're relevent to certain containers (eg PRE).
|
||||
break;
|
||||
}
|
||||
mDTD->VerifyContextStack(mContextStack,mContextStackPos);
|
||||
// mDTD->VerifyContextStack(mContextStack,mContextStackPos);
|
||||
++(*mCurrentPos);
|
||||
done=PRBool(e==*mCurrentPos);
|
||||
}
|
||||
@@ -410,15 +410,18 @@ PRBool nsHTMLParser::Parse(nsIURL* aURL,eParseMode aMode){
|
||||
result=PR_TRUE;
|
||||
mParseMode=aMode;
|
||||
ITokenizerDelegate* theDelegate=0;
|
||||
|
||||
|
||||
mDTD=0;
|
||||
switch(mParseMode) {
|
||||
case eParseMode_navigator:
|
||||
theDelegate=new CNavDelegate();
|
||||
mDTD= new CNavDTD();
|
||||
if(theDelegate)
|
||||
mDTD=theDelegate->GetDTD();
|
||||
break;
|
||||
case eParseMode_other:
|
||||
theDelegate=new COtherDelegate();
|
||||
mDTD= new COtherDTD();
|
||||
if(theDelegate)
|
||||
mDTD=theDelegate->GetDTD();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -427,9 +430,6 @@ PRBool nsHTMLParser::Parse(nsIURL* aURL,eParseMode aMode){
|
||||
NS_ERROR(kNullTokenizer);
|
||||
return PR_FALSE;
|
||||
}
|
||||
if(!mDTD) {
|
||||
mDTD= new nsHTMLDTD();
|
||||
}
|
||||
|
||||
mTokenizer=new CTokenizer(aURL, theDelegate, mParseMode);
|
||||
mTokenizer->Tokenize();
|
||||
|
||||
Reference in New Issue
Block a user