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

Backed out changeset 77af189b5c49 (bug 1373984) for build bustage in nsHtml5Parser.cpp a=backout CLOSED TREE

Browse Source 
MozReview-Commit-ID: 6kBmU71j2To
This commit is contained in:
Wes Kocher
2017-06-25 05:10:14 -07:00
parent de5721ea81
commit d214d1f5fa
81 changed files with 446 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parser/html/nsHtml5Parser.cpp
View File

@@ -100,14 +100,18 @@ nsHtml5Parser::SetCommand(eParserCommands aParserCommand)
}
NS_IMETHODIMP_(void)
nsHtml5Parser::SetDocumentCharset(NotNull<const Encoding*> aEncoding,
nsHtml5Parser::SetDocumentCharset(const nsACString& aCharset,
int32_t aCharsetSource)
{
NS_PRECONDITION(!mExecutor->HasStarted(),
"Document charset set too late.");
NS_PRECONDITION(GetStreamParser(), "Setting charset on a script-only parser.");
GetStreamParser()->SetDocumentCharset(aEncoding, aCharsetSource);
mExecutor->SetDocumentCharsetAndSource(aEncoding, aCharsetSource);
nsAutoCString trimmed;
trimmed.Assign(aCharset);
trimmed.Trim(" \t\r\n\f");
GetStreamParser()->SetDocumentCharset(trimmed, aCharsetSource);
mExecutor->SetDocumentCharsetAndSource(trimmed,
aCharsetSource);
}
NS_IMETHODIMP