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

Bug 1648464 - Add an Autodetect item to the Text Encoding menu. r=emk,chutten,Gijs

Browse Source 
Take a step towards replacing the encoding menu with a single menu item that
triggers the autodetection manually. However, don't remove anything for now.

* Add an autodetect item.
* Add telemetry for autodetect used in session.
* Add telemetry for non-autodetect used in session.
* Restore and revise telemetry for how the encoding that is being overridden
  was discovered.

Differential Revision: https://phabricator.services.mozilla.com/D81132
This commit is contained in:
Henri Sivonen
2021-01-14 07:06:53 +00:00
parent 8f03ff4322
commit dc81bb2634
14 changed files with 372 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dom/html/nsHTMLDocument.cpp
View File

@@ -206,7 +206,9 @@ void nsHTMLDocument::TryUserForcedCharset(nsIContentViewer* aCv,
nsIDocShell* aDocShell,
int32_t& aCharsetSource,
NotNull<const Encoding*>& aEncoding) {
if (kCharsetFromUserForced <= aCharsetSource) return;
if (kCharsetFromUserForced <= aCharsetSource) {
return;
}
// mCharacterSet not updated yet for channel, so check aEncoding, too.
if (WillIgnoreCharsetOverride() || !IsAsciiCompatible(aEncoding)) {
@@ -222,7 +224,9 @@ void nsHTMLDocument::TryUserForcedCharset(nsIContentViewer* aCv,
return;
}
aEncoding = WrapNotNull(encoding);
aCharsetSource = kCharsetFromUserForced;
aCharsetSource = nsDocShell::Cast(aDocShell)->GetForcedAutodetection()
? kCharsetFromPendingUserForcedAutoDetection
: kCharsetFromUserForced;
aDocShell->SetCharset(""_ns);
}
}
@@ -247,14 +251,21 @@ void nsHTMLDocument::TryParentCharset(nsIDocShell* aDocShell,
return;
}
if (kCharsetFromUserForced == parentSource ||
kCharsetFromUserForcedAutoDetection == parentSource) {
kCharsetFromUserForcedJapaneseAutoDetection == parentSource ||
kCharsetFromPendingUserForcedAutoDetection == parentSource ||
kCharsetFromInitialUserForcedAutoDetection == parentSource ||
kCharsetFromFinalUserForcedAutoDetection == parentSource) {
if (WillIgnoreCharsetOverride() ||
!IsAsciiCompatible(aEncoding) || // if channel said UTF-16
!IsAsciiCompatible(parentCharset)) {
return;
}
aEncoding = WrapNotNull(parentCharset);
aCharsetSource = kCharsetFromUserForced;
aCharsetSource =
(kCharsetFromUserForced == parentSource ||
kCharsetFromUserForcedJapaneseAutoDetection == parentSource)
? kCharsetFromUserForced
: kCharsetFromPendingUserForcedAutoDetection;
return;
}
@@ -262,7 +273,7 @@ void nsHTMLDocument::TryParentCharset(nsIDocShell* aDocShell,
return;
}
if (kCharsetFromInitialAutoDetection <= parentSource) {
if (kCharsetFromInitialAutoDetectionWouldHaveBeenUTF8 <= parentSource) {
// Make sure that's OK
if (!NodePrincipal()->Equals(parentPrincipal) ||
!IsAsciiCompatible(parentCharset)) {