| Index: third_party/WebKit/Source/wtf/Assertions.h
|
| diff --git a/third_party/WebKit/Source/wtf/Assertions.h b/third_party/WebKit/Source/wtf/Assertions.h
|
| index 6e770546cc2448635c45e7b24b09bd5cf7639053..3962562ffd6f36121f90cd2ff3a97a00b36e33f2 100644
|
| --- a/third_party/WebKit/Source/wtf/Assertions.h
|
| +++ b/third_party/WebKit/Source/wtf/Assertions.h
|
| @@ -51,14 +51,12 @@
|
| // Users must test "#if ENABLE(ASSERT)", which helps ensure that code
|
| // testing this macro has included this header.
|
| #ifndef ENABLE_ASSERT
|
| -#if DCHECK_IS_ON() && !defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
|
| -/* ASSERT* will currently crash the process if enabled, so which is not
|
| - the desired behaviour if DCHECK_IS_DUMP_WITHOUT_CRASH. */
|
| -#define ENABLE_ASSERT 1
|
| -#else
|
| +#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
|
| /* Disable ASSERT* macros in release mode by default. */
|
| #define ENABLE_ASSERT 0
|
| -#endif /* DCHECK_IS_ON() */
|
| +#else
|
| +#define ENABLE_ASSERT 1
|
| +#endif /* defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) */
|
| #endif
|
|
|
| #ifndef ASSERT_MSG_DISABLED
|
|
|