Commit 71801ed4 authored by Kathleen Brade's avatar Kathleen Brade Committed by Georg Koppen
Browse files

Bug 21876: Always use esr policies for e10s. 

Always use the policies associated with the esr update channel so that
the e10s behavior is the same for all Tor Browser builds.
parent 24bd4738

browser/extensions/e10srollout/bootstrap.js

+4 −1
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ function defineCohort() { 
  }

  cohortDefinedOnThisSession = true;



  let updateChannel = UpdateUtils.getUpdateChannel(false);

  // For Tor Browser, always use the e10s policies associated with the esr

  // update channel so that the e10s behavior is the same for all builds.

  let updateChannel = "esr";



  if (!(updateChannel in TEST_THRESHOLD)) {

    setCohort("unsupportedChannel");

    return;

toolkit/xre/nsAppRunner.cpp

+3 −6
Original line number Diff line number Diff line
@@ -5453,16 +5453,13 @@ MultiprocessBlockPolicy() { 
#endif



  /**

   * Avoids enabling e10s for Windows XP users on the release channel.

   * Avoid enabling e10s for all Windows XP users.

   */

#if defined(XP_WIN)

  if (!IsVistaOrLater()) {

    nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel");

    if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) {

    gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;

    return gMultiprocessBlockPolicy;

  }

  }

#endif // XP_WIN



  /*