Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2511)

Unified Diff: base/utf_offset_string_conversions.cc

Issue 7828092: Add UTF16ToUTF8AndAdjustOffset() to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use vector version in single-offset version. Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/utf_offset_string_conversions.h ('k') | base/utf_offset_string_conversions_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/utf_offset_string_conversions.cc
diff --git a/base/utf_offset_string_conversions.cc b/base/utf_offset_string_conversions.cc
index 26d28f55233720242a46a26b96c715dc725d2ee1..8405303fd9d95bd5fb8fe3ef0a0bcdb70102cd80 100644
--- a/base/utf_offset_string_conversions.cc
+++ b/base/utf_offset_string_conversions.cc
@@ -11,6 +11,7 @@
#include "base/utf_string_conversion_utils.h"
using base::PrepareForUTF16Or32Output;
+using base::PrepareForUTF8Output;
using base::ReadUnicodeCharacter;
using base::WriteUnicodeCharacter;
@@ -18,14 +19,15 @@ using base::WriteUnicodeCharacter;
// Unicode character type as a STL string. The given input buffer and size
// determine the source, and the given output STL string will be replaced by
// the result.
-bool ConvertUnicode(const char* src,
+template<typename SrcChar, typename DestStdString>
+bool ConvertUnicode(const SrcChar* src,
size_t src_len,
- string16* output,
+ DestStdString* output,
std::vector<size_t>* offsets_for_adjustment) {
if (offsets_for_adjustment) {
std::for_each(offsets_for_adjustment->begin(),
offsets_for_adjustment->end(),
- LimitOffset<string16>(src_len));
+ LimitOffset<DestStdString>(src_len));
}
// ICU requires 32-bit numbers.
@@ -98,6 +100,27 @@ string16 UTF8ToUTF16AndAdjustOffsets(
return result;
}
+std::string UTF16ToUTF8AndAdjustOffset(
+ const base::StringPiece16& utf16,
+ size_t* offset_for_adjustment) {
+ std::vector<size_t> offsets;
+ if (offset_for_adjustment)
+ offsets.push_back(*offset_for_adjustment);
+ std::string result = UTF16ToUTF8AndAdjustOffsets(utf16, &offsets);
+ if (offset_for_adjustment)
+ *offset_for_adjustment = offsets[0];
+ return result;
+}
+
+std::string UTF16ToUTF8AndAdjustOffsets(
+ const base::StringPiece16& utf16,
+ std::vector<size_t>* offsets_for_adjustment) {
+ std::string result;
+ PrepareForUTF8Output(utf16.data(), utf16.length(), &result);
+ ConvertUnicode(utf16.data(), utf16.length(), &result, offsets_for_adjustment);
+ return result;
+}
+
OffsetAdjuster::Adjustment::Adjustment(size_t original_offset,
size_t original_length,
size_t output_length)
« no previous file with comments | « base/utf_offset_string_conversions.h ('k') | base/utf_offset_string_conversions_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698