diff options
Diffstat (limited to 'webkit')
| -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; |