corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 524447 - Make the HTML5 parser tokenize on document.close(). (Spec svn r4241.) r=bnewman.

Browse Source
This commit is contained in:
Henri Sivonen
2009-10-27 09:44:17 +02:00
parent 42c2ae50fe
commit 23762b84db
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parser/html/nsHtml5Parser.cpp
View File

@@ -211,7 +211,7 @@ nsHtml5Parser::ContinueInterruptedParsing()
nsRefPtr<nsHtml5StreamParser> streamKungFuDeathGrip(mStreamParser);
nsRefPtr<nsHtml5TreeOpExecutor> treeOpKungFuDeathGrip(mExecutor);
CancelParsingEvents(); // If the executor caused us to continue, ignore event
ParseUntilScript();
ParseUntilBlocked();
return NS_OK;
}
@@ -298,11 +298,12 @@ nsHtml5Parser::Parse(const nsAString& aSourceBuffer,
}
if (aLastCall && aSourceBuffer.IsEmpty() && aKey == GetRootContextKey()) {
// document.close()
NS_ASSERTION(!mStreamParser,
"Had stream parser but got document.close().");
NS_ASSERTION(!mStreamParser,
"Had stream parser but got document.close().");
mDocumentClosed = PR_TRUE;
// TODO: Try to tokenize: http://www.w3.org/Bugs/Public/show_bug.cgi?id=7917
MaybePostContinueEvent();
if (!mBlocked) {
ParseUntilBlocked();
}
return NS_OK;
}
@@ -576,9 +577,9 @@ nsHtml5Parser::HandleParserContinueEvent(nsHtml5ParserContinueEvent* ev)
}
void
nsHtml5Parser::ParseUntilScript()
nsHtml5Parser::ParseUntilBlocked()
{
NS_PRECONDITION(!mFragmentMode, "ParseUntilScript called in fragment mode.");
NS_PRECONDITION(!mFragmentMode, "ParseUntilBlocked called in fragment mode.");
if (mBlocked) {
return;