diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/text/Base64.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/text/Base64.cpp')
| -rw-r--r-- | Source/WebCore/platform/text/Base64.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/platform/text/Base64.cpp b/Source/WebCore/platform/text/Base64.cpp index 98b537a..bf706f6 100644 --- a/Source/WebCore/platform/text/Base64.cpp +++ b/Source/WebCore/platform/text/Base64.cpp @@ -60,9 +60,11 @@ static const char base64DecMap[128] = { 0x31, 0x32, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00 }; -void base64Encode(const Vector<char>& in, Vector<char>& out, bool insertLFs) +String base64Encode(const char* data, unsigned length, bool insertLFs) { - base64Encode(in.data(), in.size(), out, insertLFs); + Vector<char> result; + base64Encode(data, length, result, insertLFs); + return String(result.data(), result.size()); } void base64Encode(const char* data, unsigned len, Vector<char>& out, bool insertLFs) |