diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-02-20 22:00:59 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-22 13:58:16 +0000 |
| commit | 5aa65d2aeab36ea8de8129c0babcf70a5e4e662a (patch) | |
| tree | 36ed652ffb09104d8a10c01261b851329f34882f /gfx | |
| parent | 712ca7303b0835772f8abca85ebec981e254a017 (diff) | |
| download | uxp-5aa65d2aeab36ea8de8129c0babcf70a5e4e662a.tar.gz | |
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/src/DriverCrashGuard.cpp | 8 | ||||
| -rw-r--r-- | gfx/thebes/gfxEnv.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/gfx/src/DriverCrashGuard.cpp b/gfx/src/DriverCrashGuard.cpp index 3b69d387c5..333c624e94 100644 --- a/gfx/src/DriverCrashGuard.cpp +++ b/gfx/src/DriverCrashGuard.cpp @@ -68,19 +68,11 @@ AreCrashGuardsEnabled() if (XRE_IsGPUProcess()) { return false; } -#ifdef NIGHTLY_BUILD
- // We only use the crash guard on non-nightly channels, since the nightly
- // channel is for development and having graphics features perma-disabled
- // is rather annoying. Unless the user forces is with an environment
- // variable, which comes in handy for testing.
- return gfxEnv::ForceCrashGuardNightly();
-#else
// Check to see if all guards have been disabled through the environment.
if (gfxEnv::DisableCrashGuard()) {
return false;
}
return true;
-#endif
}
void
diff --git a/gfx/thebes/gfxEnv.h b/gfx/thebes/gfxEnv.h index ff4a8063ac..e1e491a9bc 100644 --- a/gfx/thebes/gfxEnv.h +++ b/gfx/thebes/gfxEnv.h @@ -42,7 +42,6 @@ public: // Disabling the crash guard in DriverCrashGuard DECL_GFX_ENV("MOZ_DISABLE_CRASH_GUARD", DisableCrashGuard); - DECL_GFX_ENV("MOZ_FORCE_CRASH_GUARD_NIGHTLY", ForceCrashGuardNightly); // We force present to work around some Windows bugs - disable that if this // environment variable is set. |