Bug 1272751 - Remove block of GTK+ 3.20+ from e10s on release builds. r=jimm
MozReview-Commit-ID: FAeUxCKKmfQ
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4692,17 +4692,16 @@ enum {
kE10sDisabledByUser = 2,
// kE10sDisabledInSafeMode = 3, was removed in bug 1172491.
kE10sDisabledForAccessibility = 4,
// kE10sDisabledForMacGfx = 5, was removed in bug 1068674.
kE10sDisabledForBidi = 6,
kE10sDisabledForAddons = 7,
kE10sForceDisabled = 8,
kE10sDisabledForXPAcceleration = 9,
- kE10sDisabledForGTK320 = 10,
};
#if defined(XP_WIN) || defined(XP_MACOSX)
const char* kAccessibilityLastRunDatePref = "accessibility.lastLoadDate";
const char* kAccessibilityLoadedLastSessionPref = "accessibility.loadedInLastSession";
static inline uint32_t
PRTimeToSeconds(PRTime t_usec)
@@ -4779,25 +4778,16 @@ MultiprocessBlockPolicy() {
Preferences::GetBool("layers.acceleration.force-enabled");
if (layersAccelerationRequested && !IsVistaOrLater()) {
gMultiprocessBlockPolicy = kE10sDisabledForXPAcceleration;
return gMultiprocessBlockPolicy;
}
#endif // XP_WIN
-#if defined(MOZ_WIDGET_GTK) && defined(RELEASE_BUILD)
- // Bug 1266213 - Workaround for bug 1264454
- // Disable for users of 3.20 or higher
- if (gtk_check_version(3, 20, 0) == nullptr) {
- gMultiprocessBlockPolicy = kE10sDisabledForGTK320;
- return gMultiprocessBlockPolicy;
- }
-#endif
-
if (disabledForA11y) {
gMultiprocessBlockPolicy = kE10sDisabledForAccessibility;
return gMultiprocessBlockPolicy;
}
/**
* Avoids enabling e10s for certain locales that require bidi selection,
* which currently doesn't work well with e10s.