Bug 1222033 - Rename gfxCrash to gfxDevCrash. r=jrmuizel

This commit is contained in:
Milan Sreckovic 2015-11-09 07:28:00 +01:00
parent 3219e1f97e
commit cec30dd69d
4 changed files with 8 additions and 8 deletions

View File

@ -565,7 +565,7 @@ typedef Log<LOG_CRITICAL, CriticalLogger> CriticalLog;
//
// You should create a (new) enum in the LogReason and use it for the reason
// parameter to ensure uniqueness.
#define gfxCrash(reason) gfxCriticalError(int(LogOptions::AutoPrefix) | int(LogOptions::AssertOnCall) | int(LogOptions::CrashAction), (reason))
#define gfxDevCrash(reason) gfxCriticalError(int(LogOptions::AutoPrefix) | int(LogOptions::AssertOnCall) | int(LogOptions::CrashAction), (reason))
// See nsDebug.h and the NS_WARN_IF macro

View File

@ -1513,7 +1513,7 @@ CompositorD3D11::HandleError(HRESULT hr, Severity aSeverity)
// Crash if we are making invalid calls outside of device removal
if (hr == DXGI_ERROR_INVALID_CALL) {
gfxCrash(deviceRemoved ? LogReason::D3D11InvalidCallDeviceRemoved : LogReason::D3D11InvalidCall) << "Invalid D3D11 api call";
gfxDevCrash(deviceRemoved ? LogReason::D3D11InvalidCallDeviceRemoved : LogReason::D3D11InvalidCall) << "Invalid D3D11 api call";
}
if (aSeverity == Recoverable) {

View File

@ -68,10 +68,10 @@ public:
// Force double buffering in ContentClient
DECL_GFX_ENV_LIVE("MOZ_FORCE_DOUBLE_BUFFERING", ForceDoubleBuffering);
// Force gfxCrash to use MOZ_CRASH in Beta and Release
DECL_GFX_ENV_ONCE("MOZ_GFX_CRASH_MOZ_CRASH", GfxCrashMozCrash);
// Force gfxCrash to use telemetry in Nightly and Aurora
DECL_GFX_ENV_ONCE("MOZ_GFX_CRASH_TELEMETRY", GfxCrashTelemetry);
// Force gfxDevCrash to use MOZ_CRASH in Beta and Release
DECL_GFX_ENV_ONCE("MOZ_GFX_CRASH_MOZ_CRASH", GfxDevCrashMozCrash);
// Force gfxDevCrash to use telemetry in Nightly and Aurora
DECL_GFX_ENV_ONCE("MOZ_GFX_CRASH_TELEMETRY", GfxDevCrashTelemetry);
DECL_GFX_ENV_LIVE("MOZ_GFX_VR_NO_DISTORTION", VRNoDistortion);

View File

@ -311,11 +311,11 @@ CrashStatsLogForwarder::CrashAction(LogReason aReason)
#ifndef RELEASE_BUILD
// Non-release builds crash by default, but will use telemetry
// if this environment variable is present.
static bool useTelemetry = gfxEnv::GfxCrashTelemetry();
static bool useTelemetry = gfxEnv::GfxDevCrashTelemetry();
#else
// Release builds use telemetry by default, but will crash instead
// if this environment variable is present.
static bool useTelemetry = !gfxEnv::GfxCrashMozCrash();
static bool useTelemetry = !gfxEnv::GfxDevCrashMozCrash();
#endif
if (useTelemetry) {