Backed out changeset 0810ad586986 (bug 1551276) for wpt failures in ar-ISO-8859-6-late.tentative.html on a CLOSED TREE

Author: Oana Pop Rus

Cargo.lock

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* import-globals-from ../../base/content/utilityOverlay.js */
 /* import-globals-from ../../../toolkit/mozapps/preferences/fontbuilder.js */
 
 // browser.display.languageList LOCK ALL when LOCKED
@@ -30,10 +29,6 @@ Preferences.addAll([
   { id: "intl.charset.fallback.override", type: "string" },
 ]);
 
-document.getElementById("FallbackGroupbox").hidden = Services.prefs.getBoolPref(
-  "intl.charset.detector.ng.enabled"
-);
-
 var gFontsDialog = {
   _selectLanguageGroupPromise: Promise.resolve(),
 

browser/components/preferences/fonts.js

@@ -234,7 +234,7 @@
   </groupbox>
 
   <!-- Text Encoding -->
-  <groupbox id="FallbackGroupbox">
+  <groupbox>
     <label><html:h2 data-l10n-id="fonts-languages-fallback-header"/></label>
     <description data-l10n-id="fonts-languages-fallback-desc"/>
     <hbox align="center">

browser/components/preferences/fonts.xhtml

@@ -1290,8 +1290,7 @@ nsDocShell::GatherCharsetMenuTelemetry() {
             Telemetry::LABELS_ENCODING_OVERRIDE_SITUATION::RemoteNonTld);
       }
       break;
-    case kCharsetFromInitialAutoDetection:
-    case kCharsetFromFinalAutoDetection:
+    case kCharsetFromAutoDetection:
       // Changing charset on unlabeled doc where chardet fired
       if (isFileURL) {
         Telemetry::AccumulateCategorical(
@@ -1922,8 +1921,7 @@ nsDocShell::GetCharsetAutodetected(bool* aCharsetAutodetected) {
   }
   int32_t source = doc->GetDocumentCharacterSetSource();
 
-  if (source == kCharsetFromInitialAutoDetection ||
-      source == kCharsetFromFinalAutoDetection ||
+  if (source == kCharsetFromAutoDetection ||
       source == kCharsetFromUserForcedAutoDetection) {
     *aCharsetAutodetected = true;
   }

docshell/base/nsDocShell.cpp

@@ -10,15 +10,15 @@ function test() {
 
 function afterOpen() {
   is(
-    content.document.documentElement.textContent.indexOf("\u0434"),
+    content.document.documentElement.textContent.indexOf("\u00A4"),
     131,
-    "Parent doc should be IBM866 initially"
+    "Parent doc should be windows-1252 initially"
   );
 
   is(
-    content.frames[0].document.documentElement.textContent.indexOf("\u0434"),
+    content.frames[0].document.documentElement.textContent.indexOf("\u00A4"),
     87,
-    "Child doc should be IBM866 initially"
+    "Child doc should be windows-1252 initially"
   );
 }
 

docshell/test/browser/browser_bug1543077-1.js

@@ -10,15 +10,15 @@ function test() {
 
 function afterOpen() {
   is(
-    content.document.documentElement.textContent.indexOf("\u0412"),
+    content.document.documentElement.textContent.indexOf("\u201A"),
     134,
-    "Parent doc should be IBM866 initially"
+    "Parent doc should be windows-1252 initially"
   );
 
   is(
-    content.frames[0].document.documentElement.textContent.indexOf("\u0412"),
+    content.frames[0].document.documentElement.textContent.indexOf("\u201A"),
     90,
-    "Child doc should be IBM866 initially"
+    "Child doc should be windows-1252 initially"
   );
 }
 

docshell/test/browser/browser_bug1543077-2.js

@@ -10,15 +10,15 @@ function test() {
 
 function afterOpen() {
   is(
-    content.document.documentElement.textContent.indexOf("\u3042"),
+    content.document.documentElement.textContent.indexOf("\u001B"),
     136,
-    "Parent doc should be ISO-2022-JP initially"
+    "Parent doc should be windows-1252 initially"
   );
 
   is(
-    content.frames[0].document.documentElement.textContent.indexOf("\u3042"),
+    content.frames[0].document.documentElement.textContent.indexOf("\u001B"),
     92,
-    "Child doc should be ISO-2022-JP initially"
+    "Child doc should be windows-1252 initially"
   );
 }
 

docshell/test/browser/browser_bug1543077-3.js

@@ -10,15 +10,15 @@ function test() {
 
 function afterOpen() {
   is(
-    content.document.documentElement.textContent.indexOf("\u0434"),
+    content.document.documentElement.textContent.indexOf("\u00A4"),
     131,
-    "Parent doc should be IBM866 initially"
+    "Parent doc should be windows-1252 initially"
   );
 
   is(
-    content.frames[0].document.documentElement.textContent.indexOf("\u0412"),
+    content.frames[0].document.documentElement.textContent.indexOf("\u201A"),
     90,
-    "Child doc should be IBM866 initially"
+    "Child doc should be windows-1252 initially"
   );
 }
 

docshell/test/browser/browser_bug1543077-4.js

@@ -150,6 +150,7 @@
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsICategoryManager.h"
 #include "nsIChannelEventSink.h"
+#include "nsICharsetDetectionObserver.h"
 #include "nsIConsoleService.h"
 #include "nsIContent.h"
 #include "nsIContentInlines.h"

dom/base/nsContentUtils.cpp

@@ -288,8 +288,7 @@ void nsHTMLDocument::TryParentCharset(nsIDocShell* aDocShell,
     return;
   }
   if (kCharsetFromParentForced == parentSource ||
-      kCharsetFromUserForced == parentSource ||
-      kCharsetFromUserForcedAutoDetection == parentSource) {
+      kCharsetFromUserForced == parentSource) {
     if (WillIgnoreCharsetOverride() ||
         !IsAsciiCompatible(aEncoding) ||  // if channel said UTF-16
         !IsAsciiCompatible(parentCharset)) {