| Index: ppapi/shared_impl/ppb_char_set_shared.cc
|
| diff --git a/ppapi/shared_impl/ppb_char_set_shared.cc b/ppapi/shared_impl/ppb_char_set_shared.cc
|
| index 70ecd3941efc156650b8eccf2513c658098e7499..6f3a63e680320a69e013c96cce0483769a7a9181 100644
|
| --- a/ppapi/shared_impl/ppb_char_set_shared.cc
|
| +++ b/ppapi/shared_impl/ppb_char_set_shared.cc
|
| @@ -103,13 +103,13 @@ char* PPB_CharSet_Shared::UTF16ToCharSet(
|
|
|
| // ucnv_fromUChars returns size not including terminating null.
|
| char* encoded = static_cast<char*>(
|
| - thunk::GetPPB_Memory_Dev_Thunk()->MemAlloc(encoded_max_length + 1));
|
| + thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemAlloc(encoded_max_length + 1));
|
| int actual_size = ucnv_fromUChars(converter, encoded,
|
| encoded_max_length, reinterpret_cast<const UChar*>(utf16), utf16_len,
|
| &status);
|
| ucnv_close(converter);
|
| if (!U_SUCCESS(status)) {
|
| - thunk::GetPPB_Memory_Dev_Thunk()->MemFree(encoded);
|
| + thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemFree(encoded);
|
| return NULL;
|
| }
|
| encoded[actual_size] = 0;
|
| @@ -141,7 +141,7 @@ uint16_t* PPB_CharSet_Shared::CharSetToUTF16(
|
| return NULL;
|
|
|
| uint16_t* ret_buf = static_cast<uint16_t*>(
|
| - thunk::GetPPB_Memory_Dev_Thunk()->MemAlloc(
|
| + thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemAlloc(
|
| (output.size() + 1) * sizeof(uint16_t)));
|
| if (!ret_buf)
|
| return NULL;
|
|
|