Merge inbound to mozilla-central. a=merge

bholley · Dec 11, 2018 · 10fdbf6 · 10fdbf6
2 parents f5eeb09 + 83760c3
commit 10fdbf6
Show file tree

Hide file tree

Showing 58 changed files with 1,649 additions and 341 deletions.
diff --git a/dom/encoding/FallbackEncoding.cpp b/dom/encoding/FallbackEncoding.cpp
@@ -55,7 +55,6 @@ NS_IMPL_ISUPPORTS(FallbackEncoding, nsIObserver)
 
 StaticRefPtr<FallbackEncoding> FallbackEncoding::sInstance;
 bool FallbackEncoding::sGuessFallbackFromTopLevelDomain = true;
-bool FallbackEncoding::sFallbackToUTF8ForFile = false;
 
 FallbackEncoding::FallbackEncoding() : mFallback(nullptr) {
   MOZ_ASSERT(!FallbackEncoding::sInstance, "Singleton already exists.");
@@ -141,8 +140,6 @@ void FallbackEncoding::Initialize() {
                                 "intl.charset.fallback.override");
   Preferences::AddBoolVarCache(&sGuessFallbackFromTopLevelDomain,
                                "intl.charset.fallback.tld");
-  Preferences::AddBoolVarCache(&sFallbackToUTF8ForFile,
-                               "intl.charset.fallback.utf8_for_file");
 
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {

diff --git a/dom/encoding/FallbackEncoding.h b/dom/encoding/FallbackEncoding.h
@@ -27,11 +27,6 @@ class FallbackEncoding : public nsIObserver, nsSupportsWeakReference {
    */
   static bool sGuessFallbackFromTopLevelDomain;
 
-  /**
-   * Whether UTF-8 should be used for file URLs.
-   */
-  static bool sFallbackToUTF8ForFile;
-
   /**
    * Gets the locale-dependent fallback encoding for legacy HTML and plain
    * text content.

diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
@@ -438,12 +438,6 @@ void nsHTMLDocument::TryFallback(int32_t& aCharsetSource,
   if (kCharsetFromFallback <= aCharsetSource) return;
 
   aCharsetSource = kCharsetFromFallback;
-  bool isFile = false;
-  if (FallbackEncoding::sFallbackToUTF8ForFile && mDocumentURI &&
-      NS_SUCCEEDED(mDocumentURI->SchemeIs("file", &isFile)) && isFile) {
-    aEncoding = UTF_8_ENCODING;
-    return;
-  }
   aEncoding = FallbackEncoding::FromLocale();
 }
 

diff --git a/dom/html/nsHTMLDocument.h b/dom/html/nsHTMLDocument.h
@@ -282,8 +282,8 @@ class nsHTMLDocument : public nsDocument, public nsIHTMLDocument {
   void TryParentCharset(nsIDocShell* aDocShell, int32_t& charsetSource,
                         NotNull<const Encoding*>& aEncoding);
   void TryTLD(int32_t& aCharsetSource, NotNull<const Encoding*>& aCharset);
-  void TryFallback(int32_t& aCharsetSource,
-                   NotNull<const Encoding*>& aEncoding);
+  static void TryFallback(int32_t& aCharsetSource,
+                          NotNull<const Encoding*>& aEncoding);
 
   // Override so we can munge the charset on our wyciwyg channel as needed.
   virtual void SetDocumentCharacterSet(

diff --git a/dom/reporting/tests/mochitest.ini b/dom/reporting/tests/mochitest.ini
@@ -7,4 +7,5 @@ prefs =
 [test_deprecated.html]
 [test_memoryPressure.html]
 [test_delivering.html]
+skip-if = (os == "android" && debug) # Bug 1511666
 support-files = delivering.sjs iframe_delivering.html worker_delivering.js
diff --git a/dom/u2f/tests/frame_appid_facet_insecure.html b/dom/u2f/tests/frame_appid_facet_insecure.html
@@ -33,7 +33,7 @@
       local_ok(false, "Callbacks should not be called.");
     });
   } catch (err) {
-    local_ok(err.toString().includes("TypeError: window.u2f is undefined"), "accessing window.u2f should have thrown from an insecure origin");
+    local_ok(err == "TypeError: window.u2f is undefined", "accessing window.u2f should have thrown from an insecure origin");
   }
 
   try {

diff --git a/extensions/universalchardet/tests/bug1071816-1_text.html b/extensions/universalchardet/tests/bug1071816-1_text.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>UTF-8</title>
+</head>
+<body>
+§
+</body>
+</html>
diff --git a/extensions/universalchardet/tests/bug1071816-2_text.html b/extensions/universalchardet/tests/bug1071816-2_text.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>windows-1252</title>
+</head>
+<body>
+§
+</body>
+</html>