Bug 634063 - Use gfxPrefs for some layers acceleration prefs. r=nical

--HG--
extra : rebase_source : bdb700e08351d4caeb897ed2a6418b265badc5b8
This commit is contained in:
Milan Sreckovic 2015-11-17 08:58:00 +01:00
parent 3f1887d8f0
commit 8a34a23bd4

View File

@ -4644,7 +4644,7 @@ mozilla::BrowserTabsRemoteAutostart()
// When running tests with 'layers.offmainthreadcomposition.testing.enabled' and // When running tests with 'layers.offmainthreadcomposition.testing.enabled' and
// autostart set to true, return enabled. These tests must be allowed to run // autostart set to true, return enabled. These tests must be allowed to run
// remotely. Otherwise remote isn't allowed in non-nightly builds. // remotely. Otherwise remote isn't allowed in non-nightly builds.
bool testPref = Preferences::GetBool("layers.offmainthreadcomposition.testing.enabled", false); bool testPref = gfxPrefs::GetSingleton().LayersOffMainThreadCompositionTestingEnabled();
if (testPref && optInPref) { if (testPref && optInPref) {
gBrowserTabsRemoteAutostart = true; gBrowserTabsRemoteAutostart = true;
} }
@ -4672,8 +4672,8 @@ mozilla::BrowserTabsRemoteAutostart()
// e10s auto start on mac. // e10s auto start on mac.
if (gBrowserTabsRemoteAutostart) { if (gBrowserTabsRemoteAutostart) {
// Check prefs // Check prefs
bool accelDisabled = Preferences::GetBool("layers.acceleration.disabled", false) && bool accelDisabled = gfxPrefs::GetSingleton().LayersAccelerationDisabled() &&
!Preferences::GetBool("layers.acceleration.force-enabled", false); !gfxPrefs::LayersAccelerationForceEnabled();
accelDisabled = accelDisabled || !nsCocoaFeatures::AccelerateByDefault(); accelDisabled = accelDisabled || !nsCocoaFeatures::AccelerateByDefault();