corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1127201 (attempt 2, part 1) - Replace most NS_ABORT_IF_FALSE calls with MOZ_ASSERT. r=Waldo.

Browse Source
This commit is contained in:
Nicholas Nethercote
2015-02-09 14:34:50 -08:00
parent 1aac214090
commit 0247de46d8
347 changed files with 2974 additions and 3007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
widget/nsBaseScreen.cpp
View File

@@ -36,12 +36,11 @@ nsBaseScreen::GetAvailRectDisplayPix(int32_t *outLeft, int32_t *outTop,
NS_IMETHODIMP
nsBaseScreen::LockMinimumBrightness(uint32_t aBrightness)
{
NS_ABORT_IF_FALSE(
aBrightness < nsIScreen::BRIGHTNESS_LEVELS,
"Invalid brightness level to lock");
MOZ_ASSERT(aBrightness < nsIScreen::BRIGHTNESS_LEVELS,
"Invalid brightness level to lock");
mBrightnessLocks[aBrightness]++;
NS_ABORT_IF_FALSE(mBrightnessLocks[aBrightness] > 0,
"Overflow after locking brightness level");
MOZ_ASSERT(mBrightnessLocks[aBrightness] > 0,
"Overflow after locking brightness level");
CheckMinimumBrightness();
@@ -51,11 +50,10 @@ nsBaseScreen::LockMinimumBrightness(uint32_t aBrightness)
NS_IMETHODIMP
nsBaseScreen::UnlockMinimumBrightness(uint32_t aBrightness)
{
NS_ABORT_IF_FALSE(
aBrightness < nsIScreen::BRIGHTNESS_LEVELS,
"Invalid brightness level to lock");
NS_ABORT_IF_FALSE(mBrightnessLocks[aBrightness] > 0,
"Unlocking a brightness level with no corresponding lock");
MOZ_ASSERT(aBrightness < nsIScreen::BRIGHTNESS_LEVELS,
"Invalid brightness level to lock");
MOZ_ASSERT(mBrightnessLocks[aBrightness] > 0,
"Unlocking a brightness level with no corresponding lock");
mBrightnessLocks[aBrightness]--;
CheckMinimumBrightness();