Commit 45dba273 authored by abarth@chromium.org's avatar abarth@chromium.org

Move latin1_string_conversions to base

Unfortunately, we can't keep this function in webkit/glue because not everyone
who links in Blink depends on webkit/glue. For example, cc uses WebString but
doesn't depend on webkit/glue.

IMHO, the best solution to all these constraints is to put this function in
base. It's concerned with concepts that make sense in base (strings and
character sets). The only thing odd about the function is that it accepts
Latin-1 or UTF-16, which is because of the underlying string representation in
Blink.

Review URL: https://chromiumcodereview.appspot.com/15732022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203003 0039d316-1c4b-4281-b951-d872f2087c98
parent 34ea9067
...@@ -424,9 +424,11 @@ ...@@ -424,9 +424,11 @@
'string16.h', 'string16.h',
'stringprintf.cc', 'stringprintf.cc',
'stringprintf.h', 'stringprintf.h',
'strings/latin1_string_conversions.cc',
'strings/latin1_string_conversions.h',
'strings/string_number_conversions.cc',
'strings/string_split.cc', 'strings/string_split.cc',
'strings/string_split.h', 'strings/string_split.h',
'strings/string_number_conversions.cc',
'strings/string_number_conversions.h', 'strings/string_number_conversions.h',
'strings/string_piece.cc', 'strings/string_piece.cc',
'strings/string_piece.h', 'strings/string_piece.h',
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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, string16 Latin1OrUTF16ToUTF16(size_t length,
const Latin1Char* latin1, const Latin1Char* latin1,
...@@ -16,4 +16,4 @@ string16 Latin1OrUTF16ToUTF16(size_t length, ...@@ -16,4 +16,4 @@ string16 Latin1OrUTF16ToUTF16(size_t length,
return string16(utf16, utf16 + length); return string16(utf16, utf16 + length);
} }
} // namespace webkit_glue } // namespace base
...@@ -2,16 +2,15 @@ ...@@ -2,16 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef WEBKIT_GLUE_LATIN1_STRING_CONVERSIONS_H_ #ifndef BASE_STRINGS_LATIN1_STRING_CONVERSIONS_H_
#define WEBKIT_GLUE_LATIN1_STRING_CONVERSIONS_H_ #define BASE_STRINGS_LATIN1_STRING_CONVERSIONS_H_
#include <string> #include <string>
#include "base/base_export.h" #include "base/base_export.h"
#include "base/string16.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 // 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 // use unsigned char rather than char to make less tempting to mix and match
...@@ -24,10 +23,10 @@ typedef unsigned char Latin1Char; ...@@ -24,10 +23,10 @@ typedef unsigned char Latin1Char;
// WebString::operator string16() to convert one or the other character array // WebString::operator string16() to convert one or the other character array
// to string16. This function is defined here rather than in WebString.h to // to string16. This function is defined here rather than in WebString.h to
// avoid binary bloat in all the callers of the conversion operator. // avoid binary bloat in all the callers of the conversion operator.
WEBKIT_GLUE_EXPORT string16 Latin1OrUTF16ToUTF16(size_t length, BASE_EXPORT string16 Latin1OrUTF16ToUTF16(size_t length,
const Latin1Char* latin1, const Latin1Char* latin1,
const char16* utf16); const char16* utf16);
} // namespace webkit_glue } // namespace base
#endif // WEBKIT_GLUE_LATIN1_STRING_CONVERSIONS_H_ #endif // BASE_STRINGS_LATIN1_STRING_CONVERSIONS_H_
...@@ -206,8 +206,6 @@ ...@@ -206,8 +206,6 @@
'glue_serialize_deprecated.h', 'glue_serialize_deprecated.h',
'image_decoder.cc', 'image_decoder.cc',
'image_decoder.h', 'image_decoder.h',
'latin1_string_conversions.cc',
'latin1_string_conversions.h',
'network_list_observer.h', 'network_list_observer.h',
'npruntime_util.cc', 'npruntime_util.cc',
'npruntime_util.h', 'npruntime_util.h',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment