Bug 1071816 - Add a pref to fallback to UTF-8 for files from file: URLs. r=hsivonen

MozReview-Commit-ID: KFjIqYmgzTl
2017-11-30 20:55:07 +09:00
parent ff3aa503f2
commit 0036fe0ee0
5 changed files with 17 additions and 2 deletions
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -486,6 +486,12 @@ nsHTMLDocument::TryFallback(int32_t& 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();
 }