diff options
| author | Steve Block <steveblock@google.com> | 2011-10-26 18:37:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-10-28 10:28:50 +0100 |
| commit | 638aaf75a16aa7ad95fd6a129f52f3890274b2e9 (patch) | |
| tree | 38125e30e0166dd6739dc76a8a2294a215a599cc /Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h | |
| parent | bddbc84412b2d17c61aa5fa1a1c7d311ecc25729 (diff) | |
| download | external_webkit-638aaf75a16aa7ad95fd6a129f52f3890274b2e9.zip external_webkit-638aaf75a16aa7ad95fd6a129f52f3890274b2e9.tar.gz external_webkit-638aaf75a16aa7ad95fd6a129f52f3890274b2e9.tar.bz2 | |
Fix debug build
- FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld()
FrameLoader::url() was removed in
http://trac.webkit.org/changeset/76872. We should use Document::url()
instead.
- ImageBufferAndroid
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
- Add PluginDebug.cpp to build
- ChromiumIncludes.h
Don't build Chromium code without NDEBUG set
- Frame.cpp
We should not include WebKit files from WebCore. WebViewCore.h introduces
problems due to the change to ChromiumIncludes.h and is not required here.
Bug: 5448972
Change-Id: I82c5c95591bf01fb65179282d03f865df4255c89
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h index 022511a..5dd1cac 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -45,6 +45,16 @@ #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. +// Unfortunately, ASSERT() is defined from config.h, so we can't get in first. +#ifndef NDEBUG +#define NDEBUG 1 +#undef ASSERT +#define ASSERT(assertion) (void(0)) +#endif + #include <android/net/android_network_library_impl.h> #include <android/jni/jni_utils.h> #include <base/callback.h> |