diff options
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h index e59fe09..171434b 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -23,28 +23,23 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +// All source files wishing to include Chromium headers must include this file +// and must not incude Chromium headers directly. + #ifndef ChromiumIncludes_h #define ChromiumIncludes_h #include "config.h" -// Include all external/chromium files in this file so the problems with the LOG -// and LOG_ASSERT defines can be handled in one place. - -// Undefine LOG and LOG_ASSERT before including chrome code, and if they were -// defined attempt to set the macros to the Android logging macros (which are -// the only ones that actually log). +// Undefine LOG before including chrome code, and if it was defined attempt to +// set the macro to the Android logging macro (which is the only one that +// actually logs). #ifdef LOG #define LOG_WAS_DEFINED LOG #undef LOG #endif -#ifdef LOG_ASSERT -#define LOG_ASSERT_WAS_DEFINED LOG_ASSERT -#undef LOG_ASSERT -#endif - // Chromium won't build without NDEBUG set, so we set it for all source files // that use Chromium code. This means that if NDEBUG was previously unset, we // have to redefine ASSERT() to a no-op, as this is enabled in debug builds. @@ -115,9 +110,4 @@ #define LOG(priority, tag, ...) LOG_PRI(ANDROID_##priority, tag, __VA_ARGS__) #endif -#undef LOG_ASSERT -#if defined(LOG_ASSERT_WAS_DEFINED) && defined(LOG_FATAL_IF) -#define LOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ## __VA_ARGS__) -#endif - #endif |