diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
| commit | d78e03d528ba9e7395160a23bce23726067600dd (patch) | |
| tree | e8314f3d55f136a6db6bb9e2a035ae68a04dc3e9 /gfx | |
| parent | bebeb4e26a35df99e19b6c44fc957ad6c14e9059 (diff) | |
| parent | 33523f5d5ed0c3b8000aae21a50a56c238422db3 (diff) | |
| download | uxp-d78e03d528ba9e7395160a23bce23726067600dd.tar.gz | |
Merge branch 'master' into 1829
* master:
No issue - Update README and SECURITY
Issue #1885 - Follow-up: Update error message if invalid rootMargin specified.
Issue #1879 - Follow-up: Update config/external/nss/target to security/target.
Issue #1885 - Allow unitless rootMargin entries for IntersectionObserver.
Issue #1879 - Revert changes to cryptox.h
Revert "Issue #1879 - spot-fix typo in cryptox.h"
Issue #1879 - spot-fix typo in cryptox.h
Issue #21 - Change MappedAttrParser to store its nsIPrincipal instead of nsSVGElement
Issue #21 - Remove use counters telemetry
Issue #1881 - Interpret empty or whitespace root margin string as zero length
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Issue #1880 - Boot Comic Sans out of the font configuration.
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. |