diff options
| -rw-r--r-- | base/base.gypi | 4 | ||||
| -rw-r--r-- | base/strings/latin1_string_conversions.cc (renamed from webkit/glue/latin1_string_conversions.cc) | 6 | ||||
| -rw-r--r-- | base/strings/latin1_string_conversions.h (renamed from webkit/glue/latin1_string_conversions.h) | 17 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 |
4 files changed, 14 insertions, 15 deletions
diff --git a/base/base.gypi b/base/base.gypi index abfe1f5..34f2c7a 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -424,9 +424,11 @@ 'string16.h', 'stringprintf.cc', 'stringprintf.h', + 'strings/latin1_string_conversions.cc', + 'strings/latin1_string_conversions.h', + 'strings/string_number_conversions.cc', 'strings/string_split.cc', 'strings/string_split.h', - 'strings/string_number_conversions.cc', 'strings/string_number_conversions.h', 'strings/string_piece.cc', 'strings/string_piece.h', diff --git a/webkit/glue/latin1_string_conversions.cc b/base/strings/latin1_string_conversions.cc index 7fccbd6..dca62ce 100644 --- a/webkit/glue/latin1_string_conversions.cc +++ b/base/strings/latin1_string_conversions.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/latin1_string_conversions.h" +#include "base/strings/latin1_string_conversions.h" -namespace webkit_glue { +namespace base { string16 Latin1OrUTF16ToUTF16(size_t length, const Latin1Char* latin1, @@ -16,4 +16,4 @@ string16 Latin1OrUTF16ToUTF16(size_t length, return string16(utf16, utf16 + length); } -} // namespace webkit_glue +} // namespace base diff --git a/webkit/glue/latin1_string_conversions.h b/base/strings/latin1_string_conversions.h index 1232854..b79c455 100644 --- a/webkit/glue/latin1_string_conversions.h +++ b/base/strings/latin1_string_conversions.h @@ -2,16 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_LATIN1_STRING_CONVERSIONS_H_ -#define WEBKIT_GLUE_LATIN1_STRING_CONVERSIONS_H_ +#ifndef BASE_STRINGS_LATIN1_STRING_CONVERSIONS_H_ +#define BASE_STRINGS_LATIN1_STRING_CONVERSIONS_H_ #include <string> #include "base/base_export.h" #include "base/string16.h" -#include "webkit/glue/webkit_glue_export.h" -namespace webkit_glue { +namespace base { // This definition of Latin1Char matches the definition of LChar in Blink. We // use unsigned char rather than char to make less tempting to mix and match @@ -24,10 +23,10 @@ typedef unsigned char Latin1Char; // WebString::operator string16() to convert one or the other character array // to string16. This function is defined here rather than in WebString.h to // avoid binary bloat in all the callers of the conversion operator. -WEBKIT_GLUE_EXPORT string16 Latin1OrUTF16ToUTF16(size_t length, - const Latin1Char* latin1, - const char16* utf16); +BASE_EXPORT string16 Latin1OrUTF16ToUTF16(size_t length, + const Latin1Char* latin1, + const char16* utf16); -} // namespace webkit_glue +} // namespace base -#endif // WEBKIT_GLUE_LATIN1_STRING_CONVERSIONS_H_ +#endif // BASE_STRINGS_LATIN1_STRING_CONVERSIONS_H_ diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 804453e..ae6a0f6 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -206,8 +206,6 @@ 'glue_serialize_deprecated.h', 'image_decoder.cc', 'image_decoder.h', - 'latin1_string_conversions.cc', - 'latin1_string_conversions.h', 'network_list_observer.h', 'npruntime_util.cc', 'npruntime_util.h', |