author | Milan Sreckovic <milan@mozilla.com> |
Mon, 18 Jul 2016 16:35:35 -0400 | |
changeset 305832 | 3f45d79f6bc73785d1809c6ed084138fca1bb1fe |
parent 305831 | 76631f34f9bcfb8b9366200fc541f6d44a024ebb |
child 305833 | c6d147ba37b52dd368bc213580e1bec9f3f71e0d |
push id | 30472 |
push user | cbook@mozilla.com |
push date | Thu, 21 Jul 2016 14:21:44 +0000 |
treeherder | mozilla-central@29ead859749a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mchang |
bugs | 1281702 |
milestone | 50.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
gfx/2d/Logging.h | file | annotate | diff | comparison | revisions |
--- a/gfx/2d/Logging.h +++ b/gfx/2d/Logging.h @@ -496,19 +496,24 @@ private: } mMessage << "]: "; } } void WriteLog(const std::string &aString) { if (MOZ_UNLIKELY(LogIt())) { Logger::OutputMessage(aString, L, NoNewline()); + // Assert if required. We don't have a three parameter MOZ_ASSERT + // so use the underlying functions instead (see bug 1281702): +#ifdef DEBUG if (mOptions & int(LogOptions::AssertOnCall)) { - MOZ_ASSERT(false, "An assert from the graphics logger"); + MOZ_ReportAssertionFailure(aString.c_str(), __FILE__, __LINE__); + MOZ_CRASH("GFX: An assert from the graphics logger"); } +#endif if ((mOptions & int(LogOptions::CrashAction)) && ValidReason()) { Logger::CrashAction(mReason); } } } std::stringstream mMessage; int mOptions;