Bug 1463884 - patch 2 - Remove always-true argument aCheckEnvironment from gfxFcPlatformFontList::GetSampleLangForGroup. r=emilio

gfx/thebes/gfxFcPlatformFontList.cpp

@@ -2429,8 +2429,7 @@ gfxFcPlatformFontList::TryLangForGroup(const nsACString& aOSLang,
 
 void
 gfxFcPlatformFontList::GetSampleLangForGroup(nsAtom* aLanguage,
-                                             nsACString& aLangStr,
-                                             bool aCheckEnvironment)
+                                             nsACString& aLangStr)
 {
     aLangStr.Truncate();
     if (!aLanguage) {
@@ -2459,32 +2458,30 @@ gfxFcPlatformFontList::GetSampleLangForGroup(nsAtom* aLanguage,
 
     // -- check the environment for the user's preferred language that
     //    corresponds to this mozilla lang group.
-    if (aCheckEnvironment) {
-        const char *languages = getenv("LANGUAGE");
-        if (languages) {
-            const char separator = ':';
+    const char *languages = getenv("LANGUAGE");
+    if (languages) {
+        const char separator = ':';
 
-            for (const char *pos = languages; true; ++pos) {
-                if (*pos == '\0' || *pos == separator) {
-                    if (languages < pos &&
-                        TryLangForGroup(Substring(languages, pos),
-                                        aLanguage, aLangStr)) {
-                        return;
-                    }
-
-                    if (*pos == '\0') {
-                        break;
-                    }
-
-                    languages = pos + 1;
+        for (const char *pos = languages; true; ++pos) {
+            if (*pos == '\0' || *pos == separator) {
+                if (languages < pos &&
+                    TryLangForGroup(Substring(languages, pos),
+                                    aLanguage, aLangStr)) {
+                    return;
                 }
+
+                if (*pos == '\0') {
+                    break;
+                }
+
+                languages = pos + 1;
             }
         }
-        const char *ctype = setlocale(LC_CTYPE, nullptr);
-        if (ctype &&
-            TryLangForGroup(nsDependentCString(ctype), aLanguage, aLangStr)) {
-            return;
-        }
+    }
+    const char *ctype = setlocale(LC_CTYPE, nullptr);
+    if (ctype &&
+        TryLangForGroup(nsDependentCString(ctype), aLanguage, aLangStr)) {
+        return;
     }
 
     if (mozLangGroup->defaultLang) {

gfx/thebes/gfxFcPlatformFontList.h

@@ -328,8 +328,7 @@ public:
     }
 
     // map lang group ==> lang string
-    void GetSampleLangForGroup(nsAtom* aLanguage, nsACString& aLangStr,
-                               bool aCheckEnvironment = true);
+    void GetSampleLangForGroup(nsAtom* aLanguage, nsACString& aLangStr);
 
     static FT_Library GetFTLibrary();