Bug 1095559: Fix logic error in HW acceleration tests for e10s. r=jimm
authorDave Townsend <dtownsend@oxymoronical.com>
Fri, 07 Nov 2014 09:18:28 -0800
changeset 214665 f7ba147a8b5f2e4cb6cc0d87e51ae16e8fed7563
parent 214664 fc30354927a2a7d3a9ebf71ddc650506005a362f
child 214666 bc84a9d465dbe51698c7cbdfa5768968aca60675
push id27791
push userkwierso@gmail.com
push dateSat, 08 Nov 2014 01:43:47 +0000
treeherdermozilla-central@b7f2bf6856a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1095559
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1095559: Fix logic error in HW acceleration tests for e10s. r=jimm
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4617,17 +4617,17 @@ mozilla::BrowserTabsRemoteAutostart()
   // If for any reason we suspect acceleration will be disabled, disabled
   // e10s auto start. (bug 1068199) THIS IS A TEMPORARY WORKAROUND.
   if (gBrowserTabsRemoteAutostart) {
     // Check prefs
     bool accelDisabled = Preferences::GetBool("layers.acceleration.disabled", false) &&
                          !Preferences::GetBool("layers.acceleration.force-enabled", false);
 
 #if defined(XP_MACOSX)
-    accelDisabled = !nsCocoaFeatures::AccelerateByDefault();
+    accelDisabled = accelDisabled || !nsCocoaFeatures::AccelerateByDefault();
 #endif
 
     // Check for blocked drivers
     if (!accelDisabled) {
       nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
       if (gfxInfo) {
         int32_t status;
 #if defined(XP_WIN)