Bug 1042295 - Change in Linux OMTC activation. r=nical

This commit is contained in:
"Jan Alexander Steffens (heftig)" 2014-07-22 22:46:02 +02:00
parent 449b827565
commit 32a91eb036

View File

@ -2031,15 +2031,16 @@ gfxPlatform::UsesOffMainThreadCompositing()
gfxPrefs::LayersOffMainThreadCompositionEnabled() ||
gfxPrefs::LayersOffMainThreadCompositionForceEnabled() ||
gfxPrefs::LayersOffMainThreadCompositionTestingEnabled();
#if defined(MOZ_WIDGET_GTK) && defined(NIGHTLY_BUILD)
#if defined(MOZ_WIDGET_GTK)
// Linux users who chose OpenGL are being grandfathered in to OMTC
result |=
gfxPrefs::LayersAccelerationForceEnabled() ||
PR_GetEnv("MOZ_USE_OMTC") ||
PR_GetEnv("MOZ_OMTC_ENABLED"); // yeah, these two env vars do the same thing.
// I'm told that one of them is enabled on some test slaves config.
// so be slightly careful if you think you can
// remove one of them.
result |= gfxPrefs::LayersAccelerationForceEnabled();
#if !defined(NIGHTLY_BUILD)
// Yeah, these two env vars do the same thing.
// I'm told that one of them is enabled on some test slaves config,
// so be slightly careful if you think you can remove one of them.
result &= PR_GetEnv("MOZ_USE_OMTC") || PR_GetEnv("MOZ_OMTC_ENABLED");
#endif
#endif
firstTime = false;
}