diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 21:25:34 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 21:25:34 +0000 |
| commit | d25e33ae95843833cc90fa266980911156d2ded0 (patch) | |
| tree | 37dae9fa53f6acf964f8f875a556df537f90d311 | |
| parent | 776b7aa80e8145ff20368c075e3c8052c7ef2d4f (diff) | |
| download | chromium_src-d25e33ae95843833cc90fa266980911156d2ded0.zip chromium_src-d25e33ae95843833cc90fa266980911156d2ded0.tar.gz chromium_src-d25e33ae95843833cc90fa266980911156d2ded0.tar.bz2 | |
Add a few more |#undef LOG| directives to code that might see both WebKit's
and Chromium's definitions of LOG. This is necessary after WebKit r47092
exposed its LOG in a few more places.
BUG=0
TEST=WebKit Canaries come back to life
Review URL: http://codereview.chromium.org/164421
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23221 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/bookmarklet_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/event_sending_controller.cc | 10 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_worker/test_worker_main.cc | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/webkit/glue/bookmarklet_unittest.cc b/webkit/glue/bookmarklet_unittest.cc index da06bd1..4412d61 100644 --- a/webkit/glue/bookmarklet_unittest.cc +++ b/webkit/glue/bookmarklet_unittest.cc @@ -4,6 +4,8 @@ #include "config.h" +#undef LOG + #include "testing/gtest/include/gtest/gtest.h" #include "base/file_util.h" diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index 0e1939a..7165bb6 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -14,15 +14,17 @@ // The behavior of queuing events and replaying them can be disabled by a // layout test by setting eventSender.dragMode to false. -#include "webkit/tools/test_shell/event_sending_controller.h" - -#include <queue> - // TODO(darin): This is very wrong. We should not be including WebCore headers // directly like this!! #include "config.h" #include "KeyboardCodes.h" +#undef LOG + +#include "webkit/tools/test_shell/event_sending_controller.h" + +#include <queue> + #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 654dc314..dbd199b 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -8,6 +8,8 @@ #include "config.h" +#undef LOG + #include "webkit/tools/test_shell/test_webview_delegate.h" #include "base/file_util.h" diff --git a/webkit/tools/test_shell/test_worker/test_worker_main.cc b/webkit/tools/test_shell/test_worker/test_worker_main.cc index 9a5912d..e20f772 100644 --- a/webkit/tools/test_shell/test_worker/test_worker_main.cc +++ b/webkit/tools/test_shell/test_worker/test_worker_main.cc @@ -4,6 +4,8 @@ #include "config.h" +#undef LOG + #include "base/at_exit.h" #include "base/gfx/native_widget_types.h" #include "base/logging.h" |