Backed out changeset 3198f930b755 (bug 1312049) for frequent timeouts in M(oth) toolkit/content/tests/chrome/test_tooltip.xul on Windows opt and pgo. r=backout a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 29 Oct 2016 15:29:01 +0200
changeset 431500 969c3295d3aa77931cca26eddb047d9d74bd9858
parent 431499 950739a54a07f38d8659da430429892a65967983
child 431501 7727f99d1c21a5dd2fd7f747bee79097a65aac95
child 431509 cfe60ad2a0cec08fa18408ad158e5f3286c57848
child 431513 9e0531a5633ac55562c4511504fc69e11e9d52ff
child 431514 8c5c719e1164043cb9702e4478e57b91beec961b
child 431528 edd7cebbc563106f557c623ef6c63463563df48d
child 431541 bba7564e6dbd4d1efbeb4fc74efb630424a30526
child 431548 93ab9dfffbbc67c10f933771535dd771da277825
child 431560 97acfe0cc4cee94dcf3d0b9a13da63ff476cce9c
child 431563 2f78e0f736c8736902828ff32050f980587bb3eb
child 431566 330fbb5b5f36a846b0f2f648940c7761e85c965f
child 431567 525e9ff9351d4c8d7284233fa97124ec1a32496d
child 431576 198f58927365562aba994fea981a3bb3f7bf497b
child 431607 7bc71380c4558e561edd1e94baefca5a49b70d08
child 431610 65d125cdc91a0014cd172857ee8a0a74648d8ff7
child 431697 204116818988f372cdc7cb3b3525197de75c520f
child 431701 bd15700651a92b7738f09ffac28f3028d210f2c7
child 431703 55deb4eb740f8021e59b1e6a12e6d09938c964eb
child 431725 2c90b89b59b6c2f17e48c9006ec80efa17b30214
child 431726 7580e46efeacc7e7c5482ef3ea17c9127ac04c4a
child 432022 a3cc9bdda5307fd038560de7c2950c473fa1d1f5
child 432040 3b32b92ab3867846a51bdfeb486e61d4e097a946
child 432351 a5ae27a88d40db8cdd7689403bb822c1c91246a4
child 432827 48f07af5b0a1ea5c697e7aed8cb3f78d7eb8cf01
child 433467 bebc42eeacb99d3beaeb8431576b7f0eda88de81
child 436751 b213278845d50cd3185fa7e0ebdb974c4bf29c8c
child 438108 d13c30bdce890afe717d496adb5dd67571d6bfea
child 438114 c28d7d9ee38699256ddcefadba5e02cca42551e5
child 438115 2ae1f8c991371246c72ed69e02ff91052a4687fc
child 438116 a9446cdf3d041f4956e79e9da9e4af654714d80c
push id34046
push userbmo:standard8@mozilla.com
push dateSat, 29 Oct 2016 13:50:40 +0000
reviewersbackout, backout
bugs1312049
milestone52.0a1
backs out3198f930b755ff943d1ab0e1f5c422b0801db625
Backed out changeset 3198f930b755 (bug 1312049) for frequent timeouts in M(oth) toolkit/content/tests/chrome/test_tooltip.xul on Windows opt and pgo. r=backout a=backout MozReview-Commit-ID: 9m1YbuXkj
chrome/nsChromeRegistry.cpp
modules/libpref/init/all.js
--- a/chrome/nsChromeRegistry.cpp
+++ b/chrome/nsChromeRegistry.cpp
@@ -645,21 +645,16 @@ nsChromeRegistry::MustLoadURLRemotely(ns
     *aResult = !!(flags & REMOTE_REQUIRED);
   }
   return NS_OK;
 }
 
 bool
 nsChromeRegistry::GetDirectionForLocale(const nsACString& aLocale)
 {
-#ifdef ENABLE_INTL_API
-  nsAutoCString locale(aLocale);
-  SanitizeForBCP47(locale);
-  return uloc_isRightToLeft(locale.get());
-#else
   // first check the intl.uidirection.<locale> preference, and if that is not
   // set, check the same preference but with just the first two characters of
   // the locale. If that isn't set, default to left-to-right.
   nsAutoCString prefString = NS_LITERAL_CSTRING("intl.uidirection.") + aLocale;
   nsCOMPtr<nsIPrefBranch> prefBranch (do_GetService(NS_PREFSERVICE_CONTRACTID));
   if (!prefBranch) {
     return false;
   }
@@ -670,17 +665,16 @@ nsChromeRegistry::GetDirectionForLocale(
     int32_t hyphen = prefString.FindChar('-');
     if (hyphen >= 1) {
       nsAutoCString shortPref(Substring(prefString, 0, hyphen));
       prefBranch->GetCharPref(shortPref.get(), getter_Copies(dir));
     }
   }
 
   return dir.EqualsLiteral("rtl");
-#endif
 }
 
 NS_IMETHODIMP_(bool)
 nsChromeRegistry::WrappersEnabled(nsIURI *aURI)
 {
   nsCOMPtr<nsIURL> chromeURL (do_QueryInterface(aURI));
   if (!chromeURL)
     return false;
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2040,24 +2040,22 @@ pref("intl.ime.hack.on_ime_unaware_apps.
 #endif
 
 // If you use legacy Chinese IME which puts an ideographic space to composition
 // string as placeholder, this pref might be useful.  If this is true and when
 // web contents forcibly commits composition (e.g., moving focus), the
 // ideographic space will be ignored (i.e., commits with empty string).
 pref("intl.ime.remove_placeholder_character_at_commit", false);
 
-#ifndef ENABLE_INTL_API
 // these locales have right-to-left UI
 pref("intl.uidirection.ar", "rtl");
 pref("intl.uidirection.he", "rtl");
 pref("intl.uidirection.fa", "rtl");
 pref("intl.uidirection.ug", "rtl");
 pref("intl.uidirection.ur", "rtl");
-#endif
 
 // use en-US hyphenation by default for content tagged with plain lang="en"
 pref("intl.hyphenation-alias.en", "en-us");
 // and for other subtags of en-*, if no specific patterns are available
 pref("intl.hyphenation-alias.en-*", "en-us");
 
 pref("intl.hyphenation-alias.af-*", "af");
 pref("intl.hyphenation-alias.bg-*", "bg");