Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

95487 - document.write shouldn't be interrupted. r=kmcclusk, sr=jst

Browse Source
This commit is contained in:
harishd%netscape.com 2002-01-03 21:25:33 +00:00
parent 02da144315
commit 23bbf73083
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htmlparser/src/nsParser.cpp
View File

@ -1726,7 +1726,8 @@ nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
//printf("Parse(string) iterate: %i",PR_FALSE);
pc->mScanner->Append(aSourceBuffer);
result=ResumeParse(PR_FALSE);
// Do not interrupt document.write() - bug 95487
result = ResumeParse(PR_FALSE, PR_FALSE, PR_FALSE);
}
else {
@ -1743,7 +1744,7 @@ nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
if(aLastCall) {
mParserContext->mStreamListenerState=eOnStop;
}
ResumeParse(PR_FALSE);
ResumeParse(PR_FALSE, PR_FALSE, PR_FALSE);
}
}
}//if
@ -1806,7 +1807,7 @@ nsresult nsParser::ParseFragment(const nsAReadableString& aSourceBuffer,
* @param aIsFinalChunk : tells us when the last chunk of data is provided.
* @return error code -- 0 if ok, non-zero if error.
*/
nsresult nsParser::ResumeParse(PRBool allowIteration, PRBool aIsFinalChunk) {
nsresult nsParser::ResumeParse(PRBool allowIteration, PRBool aIsFinalChunk, PRBool aCanInterrupt) {
//printf(" Resume %i, prev-context: %p\n",allowIteration,mParserContext->mPrevContext);
@ -1841,7 +1842,7 @@ nsresult nsParser::ResumeParse(PRBool allowIteration, PRBool aIsFinalChunk) {
//Only allow parsing to be interuptted in the subsequent call
//to build model.
SetCanInterrupt(PR_TRUE);
SetCanInterrupt(aCanInterrupt);
nsresult theTokenizerResult=Tokenize(aIsFinalChunk); // kEOF==2152596456
result=BuildModel();

4
htmlparser/src/nsParser.h
View File

@ -269,7 +269,9 @@ class nsParser : public nsIParser,
* @update gess5/11/98
* @return TRUE if all went well, otherwise FALSE
*/
virtual nsresult ResumeParse(PRBool allowIteration=PR_TRUE, PRBool aIsFinalChunk=PR_FALSE);
virtual nsresult ResumeParse(PRBool allowIteration = PR_TRUE,
PRBool aIsFinalChunk = PR_FALSE,
PRBool aCanInterrupt = PR_TRUE);
#ifdef DEBUG
void DebugDumpSource(nsOutputStream& anOutput);

9
parser/htmlparser/src/nsParser.cpp
View File

@ -1726,7 +1726,8 @@ nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
//printf("Parse(string) iterate: %i",PR_FALSE);
pc->mScanner->Append(aSourceBuffer);
result=ResumeParse(PR_FALSE);
// Do not interrupt document.write() - bug 95487
result = ResumeParse(PR_FALSE, PR_FALSE, PR_FALSE);
}
else {
@ -1743,7 +1744,7 @@ nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
if(aLastCall) {
mParserContext->mStreamListenerState=eOnStop;
}
ResumeParse(PR_FALSE);
ResumeParse(PR_FALSE, PR_FALSE, PR_FALSE);
}
}
}//if
@ -1806,7 +1807,7 @@ nsresult nsParser::ParseFragment(const nsAReadableString& aSourceBuffer,
* @param aIsFinalChunk : tells us when the last chunk of data is provided.
* @return error code -- 0 if ok, non-zero if error.
*/
nsresult nsParser::ResumeParse(PRBool allowIteration, PRBool aIsFinalChunk) {
nsresult nsParser::ResumeParse(PRBool allowIteration, PRBool aIsFinalChunk, PRBool aCanInterrupt) {
//printf(" Resume %i, prev-context: %p\n",allowIteration,mParserContext->mPrevContext);
@ -1841,7 +1842,7 @@ nsresult nsParser::ResumeParse(PRBool allowIteration, PRBool aIsFinalChunk) {
//Only allow parsing to be interuptted in the subsequent call
//to build model.
SetCanInterrupt(PR_TRUE);
SetCanInterrupt(aCanInterrupt);
nsresult theTokenizerResult=Tokenize(aIsFinalChunk); // kEOF==2152596456
result=BuildModel();

4
parser/htmlparser/src/nsParser.h
View File

@ -269,7 +269,9 @@ class nsParser : public nsIParser,
* @update gess5/11/98
* @return TRUE if all went well, otherwise FALSE
*/
virtual nsresult ResumeParse(PRBool allowIteration=PR_TRUE, PRBool aIsFinalChunk=PR_FALSE);
virtual nsresult ResumeParse(PRBool allowIteration = PR_TRUE,
PRBool aIsFinalChunk = PR_FALSE,
PRBool aCanInterrupt = PR_TRUE);
#ifdef DEBUG
void DebugDumpSource(nsOutputStream& anOutput);