diff options
| author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 01:25:32 +0000 |
|---|---|---|
| committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 01:25:32 +0000 |
| commit | 44cd16fcc85697b5094250a89decaab5c692b392 (patch) | |
| tree | 37e4fb0dbee34f2cc673c287b54515a71b1f9629 /webkit | |
| parent | 5f800edb90578f08b3462e1dc96b78bf0ec56d36 (diff) | |
| download | chromium_src-44cd16fcc85697b5094250a89decaab5c692b392.zip chromium_src-44cd16fcc85697b5094250a89decaab5c692b392.tar.gz chromium_src-44cd16fcc85697b5094250a89decaab5c692b392.tar.bz2 | |
DCHECK vswprintf format string cross-platform portability. Use %ls, not %s, for wchar_t* fields.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/dom_operations.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/editor_client_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_np_utils.cpp | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index dd89d84..8b1e8bd 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -49,10 +49,13 @@ #pragma warning(pop) #undef LOG +// Brings in more WebKit headers and #undefs LOG again, so this needs to come +// first. +#include "webkit/glue/autocomplete_input_listener.h" + #include "webkit/glue/dom_operations.h" #include "base/string_util.h" -#include "webkit/glue/autocomplete_input_listener.h" #include "webkit/glue/form_data.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/password_autocomplete_listener.h" diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc index 50545d6..a5ec8de 100644 --- a/webkit/glue/editor_client_impl.cc +++ b/webkit/glue/editor_client_impl.cc @@ -42,7 +42,6 @@ #include "KeyboardEvent.h" #include "PlatformKeyboardEvent.h" #include "PlatformString.h" -#include "WebView.h" #pragma warning(pop) #undef LOG @@ -51,6 +50,7 @@ #include "webkit/glue/editor_client_impl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/webview.h" #include "webkit/glue/webview_impl.h" // The notImplemented() from NotImplemented.h is now being dragged in via diff --git a/webkit/port/bindings/v8/v8_np_utils.cpp b/webkit/port/bindings/v8/v8_np_utils.cpp index 3887460..c1d3510 100644 --- a/webkit/port/bindings/v8/v8_np_utils.cpp +++ b/webkit/port/bindings/v8/v8_np_utils.cpp @@ -31,10 +31,12 @@ #include "v8_np_utils.h" -#include "base/scoped_ptr.h" -#include "base/string_util.h" #include "DOMWindow.h" #include "Frame.h" +#undef LOG + +#include "base/scoped_ptr.h" +#include "base/string_util.h" #include "npruntime_priv.h" #include "np_v8object.h" #include "v8_npobject.h" |