diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 18:26:51 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 18:26:51 +0000 |
| commit | 6f65cc3b4114080938c42bc1f3f55c0188f27163 (patch) | |
| tree | 52569c01936dd898d1cc5bf29dc606ff05d06ff7 | |
| parent | e2ad153b226d66618b989e0e551ba157336b6ea9 (diff) | |
| download | chromium_src-6f65cc3b4114080938c42bc1f3f55c0188f27163.zip chromium_src-6f65cc3b4114080938c42bc1f3f55c0188f27163.tar.gz chromium_src-6f65cc3b4114080938c42bc1f3f55c0188f27163.tar.bz2 | |
Suppress a warning about LOG being re-defined.
temporary_glue.cc includes webview_impl.h, which brings in headers
that include wtf/Assertions.h. However, it also brings in logging.h.
The workaround is to include wtf/Assertions.h in temporary_glue.cc
and then #undef LOG. This effectively mimics what we do elsewhere
in glue.
TEST=none
BUG=none
R=brettw
Review URL: http://codereview.chromium.org/149339
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20172 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/temporary_glue.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/temporary_glue.cc b/webkit/glue/temporary_glue.cc index fb201b1..23724ed 100644 --- a/webkit/glue/temporary_glue.cc +++ b/webkit/glue/temporary_glue.cc @@ -5,6 +5,9 @@ #include "config.h" #include "webkit/api/src/TemporaryGlue.h" +#include <wtf/Assertions.h> +#undef LOG + #include "webkit/glue/webview_impl.h" using WebCore::Frame; diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h index 405d654..ac85c06 100644 --- a/webkit/glue/webview_impl.h +++ b/webkit/glue/webview_impl.h @@ -7,6 +7,8 @@ #include <set> +#include "Page.h" + #include "base/basictypes.h" #include "base/compiler_specific.h" #include "skia/ext/platform_canvas.h" @@ -18,11 +20,6 @@ #include "webkit/glue/webpreferences.h" #include "webkit/glue/webview.h" -MSVC_PUSH_WARNING_LEVEL(0); -#include "Page.h" -#include "RenderTheme.h" -MSVC_POP_WARNING(); - namespace WebCore { class ChromiumDataObject; class Frame; |