mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for Bug 16126 -- Error message was not getting propagated 

to the parser ( CNavDTD::AddLeaf() )
Related to bug 16578 - Throwing userdefined tags to the floor
( what we used to do before ). This will avoid people from being
blocked.   Will work on a fix later.

r=nisheeth
This commit is contained in:
harishd%netscape.com 1999-10-18 20:23:27 +00:00
Родитель bbc97e3fac
Коммит f749a4d3e1
2 изменённых файлов: 122 добавлений и 100 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

111
htmlparser/src/CNavDTD.cpp
Просмотреть файл

@ -1258,6 +1258,9 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
result=HandleDefaultStartToken(aToken,theChildTag,*theNode);
break;
case eHTMLTag_userdefined:
break;
case eHTMLTag_script:
theHeadIsParent=(!mHasOpenBody); //intentionally fall through...
mHasOpenScript=PR_TRUE;
@ -2838,62 +2841,70 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode& aNode){
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
PRBool done=PR_FALSE;
nsCParserNode* theNode=CreateNode();
CTokenRecycler* theRecycler=(CTokenRecycler*)mTokenizer->GetTokenRecycler();
while(!done) {
CToken* theToken=mTokenizer->PeekToken();
if(theToken) {
theTag=(eHTMLTags)theToken->GetTypeID();
switch(theTag) {
case eHTMLTag_newline:
mLineNumber++;
case eHTMLTag_whitespace:
{
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber,0);
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
if(theRecycler) {
theRecycler->RecycleToken(theToken);
if(NS_SUCCEEDED(result)) {
PRBool done=PR_FALSE;
nsCParserNode* theNode=CreateNode();
CTokenRecycler* theRecycler=(CTokenRecycler*)mTokenizer->GetTokenRecycler();
while(!done && NS_SUCCEEDED(result)) {
CToken* theToken=mTokenizer->PeekToken();
if(theToken) {
theTag=(eHTMLTags)theToken->GetTypeID();
switch(theTag) {
case eHTMLTag_newline:
mLineNumber++;
case eHTMLTag_whitespace:
{
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber,0);
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
if((NS_SUCCEEDED(result))||(NS_ERROR_HTMLPARSER_BLOCK==result)) {
if(theRecycler) {
theRecycler->RecycleToken(theToken);
}
else delete theToken;
}
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
}
else delete theToken;
}
break;
case eHTMLTag_text:
if(mHasOpenBody && (!mHasOpenHead)) {
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber);
break;
case eHTMLTag_text:
if(mHasOpenBody && (!mHasOpenHead)) {
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber);
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
if(theRecycler) {
theRecycler->RecycleToken(theToken);
if((NS_SUCCEEDED(result))||(NS_ERROR_HTMLPARSER_BLOCK==result)) {
if(theRecycler) {
theRecycler->RecycleToken(theToken);
}
else delete theToken;
}
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
}
else delete theToken;
}
else done=PR_TRUE;
break;
default:
done=PR_TRUE;
} //switch
}//if
else done=PR_TRUE;
} //while
RecycleNode(theNode);
else done=PR_TRUE;
break;
default:
done=PR_TRUE;
} //switch
}//if
else done=PR_TRUE;
} //while
RecycleNode(theNode);
}
}
return result;
}

111
parser/htmlparser/src/CNavDTD.cpp
Просмотреть файл

@ -1258,6 +1258,9 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
result=HandleDefaultStartToken(aToken,theChildTag,*theNode);
break;
case eHTMLTag_userdefined:
break;
case eHTMLTag_script:
theHeadIsParent=(!mHasOpenBody); //intentionally fall through...
mHasOpenScript=PR_TRUE;
@ -2838,62 +2841,70 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode& aNode){
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
PRBool done=PR_FALSE;
nsCParserNode* theNode=CreateNode();
CTokenRecycler* theRecycler=(CTokenRecycler*)mTokenizer->GetTokenRecycler();
while(!done) {
CToken* theToken=mTokenizer->PeekToken();
if(theToken) {
theTag=(eHTMLTags)theToken->GetTypeID();
switch(theTag) {
case eHTMLTag_newline:
mLineNumber++;
case eHTMLTag_whitespace:
{
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber,0);
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
if(theRecycler) {
theRecycler->RecycleToken(theToken);
if(NS_SUCCEEDED(result)) {
PRBool done=PR_FALSE;
nsCParserNode* theNode=CreateNode();
CTokenRecycler* theRecycler=(CTokenRecycler*)mTokenizer->GetTokenRecycler();
while(!done && NS_SUCCEEDED(result)) {
CToken* theToken=mTokenizer->PeekToken();
if(theToken) {
theTag=(eHTMLTags)theToken->GetTypeID();
switch(theTag) {
case eHTMLTag_newline:
mLineNumber++;
case eHTMLTag_whitespace:
{
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber,0);
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
if((NS_SUCCEEDED(result))||(NS_ERROR_HTMLPARSER_BLOCK==result)) {
if(theRecycler) {
theRecycler->RecycleToken(theToken);
}
else delete theToken;
}
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
}
else delete theToken;
}
break;
case eHTMLTag_text:
if(mHasOpenBody && (!mHasOpenHead)) {
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber);
break;
case eHTMLTag_text:
if(mHasOpenBody && (!mHasOpenHead)) {
theToken=mTokenizer->PopToken();
theNode->Init(theToken,mLineNumber);
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
STOP_TIMER();
result=mSink->AddLeaf(*theNode);
if(theRecycler) {
theRecycler->RecycleToken(theToken);
if((NS_SUCCEEDED(result))||(NS_ERROR_HTMLPARSER_BLOCK==result)) {
if(theRecycler) {
theRecycler->RecycleToken(theToken);
}
else delete theToken;
}
RAPTOR_STOPWATCH_DEBUGTRACE(("Start: Parse Time: CNavDTD::AddLeaf(), this=%p\n", this));
START_TIMER();
}
else delete theToken;
}
else done=PR_TRUE;
break;
default:
done=PR_TRUE;
} //switch
}//if
else done=PR_TRUE;
} //while
RecycleNode(theNode);
else done=PR_TRUE;
break;
default:
done=PR_TRUE;
} //switch
}//if
else done=PR_TRUE;
} //while
RecycleNode(theNode);
}
}
return result;
}