Bug 1272751 - Remove block of GTK+ 3.20+ from e10s on release builds. r=jimm, a=sledru
authorFelipe Gomes <felipc@gmail.com>
Mon, 16 May 2016 14:53:44 -0300
changeset 333057 d9474bded24085f858b008c51ac199888bc72a21
parent 333056 29a31af637201be453147527100645746fbd8c96
child 333058 f056a916bf8e280ad85f256147a51138fce9ecb1
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm, sledru
bugs1272751
milestone48.0a2
Bug 1272751 - Remove block of GTK+ 3.20+ from e10s on release builds. r=jimm, a=sledru MozReview-Commit-ID: FAeUxCKKmfQ
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4671,17 +4671,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)
@@ -4758,25 +4757,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.