wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1243882 - Block e10s for locales based on Firefox's locale, not the OS. r=ehsan

Browse Source
This commit is contained in:
Felipe Gomes 2016-02-02 21:13:26 -02:00
parent fd458664cc
commit 8bdd804fcc
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
toolkit/xre/nsAppRunner.cpp
View File

@ -66,7 +66,6 @@
#include "nsIDOMWindow.h"
#include "mozilla/ModuleUtils.h"
#include "nsIIOService2.h"
#include "nsILocaleService.h"
#include "nsIObserverService.h"
#include "nsINativeAppSupport.h"
#include "nsIProcess.h"
@ -4652,31 +4651,25 @@ mozilla::BrowserTabsRemoteAutostart()
* which currently doesn't work well with e10s.
*/
bool disabledForBidi = false;
do { // to allow 'break' to abort this block if a call fails
nsresult rv;
nsCOMPtr<nsILocaleService> ls =
do_GetService(NS_LOCALESERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv))
break;
nsCOMPtr<nsILocale> appLocale;
rv = ls->GetApplicationLocale(getter_AddRefs(appLocale));
if (NS_FAILED(rv))
break;
nsAutoCString locale;
nsCOMPtr<nsIXULChromeRegistry> registry =
mozilla::services::GetXULChromeRegistryService();
if (registry) {
registry->GetSelectedLocale(NS_LITERAL_CSTRING("global"), locale);
}
nsString localeStr;
rv = appLocale->
GetCategory(NS_LITERAL_STRING(NSILOCALE_MESSAGE), localeStr);
if (NS_FAILED(rv))
break;
int32_t index = locale.FindChar('-');
if (index >= 0) {
locale.Truncate(index);
}
if (localeStr.EqualsLiteral("ar") ||
localeStr.EqualsLiteral("fa") ||
localeStr.EqualsLiteral("he") ||
localeStr.EqualsLiteral("ur")) {
disabledForBidi = true;
}
} while (0);
if (locale.EqualsLiteral("ar") ||
locale.EqualsLiteral("fa") ||
locale.EqualsLiteral("he") ||
locale.EqualsLiteral("ur")) {
disabledForBidi = true;
}
bool optInPref = Preferences::GetBool("browser.tabs.remote.autostart", false);
bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.2", false);