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

Bug 1646484 - Remove nsIDocShell::forcedCharset. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D80072
This commit is contained in:
Henri Sivonen
2020-06-18 01:18:11 +00:00
parent b08df050c2
commit 202b60fc22
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docshell/base/nsDocShell.cpp
View File

@@ -1356,12 +1356,6 @@ nsDocShell::GatherCharsetMenuTelemetry() {
NS_IMETHODIMP
nsDocShell::SetCharset(const nsACString& aCharset) {
// set the charset override
return SetForcedCharset(aCharset);
}
NS_IMETHODIMP
nsDocShell::SetForcedCharset(const nsACString& aCharset) {
if (aCharset.IsEmpty()) {
mForcedCharset = nullptr;
return NS_OK;
@@ -1379,16 +1373,6 @@ nsDocShell::SetForcedCharset(const nsACString& aCharset) {
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetForcedCharset(nsACString& aResult) {
if (mForcedCharset) {
mForcedCharset->Name(aResult);
} else {
aResult.Truncate();
}
return NS_OK;
}
void nsDocShell::SetParentCharset(const Encoding*& aCharset,
int32_t aCharsetSource,
nsIPrincipal* aPrincipal) {