| Index: ppapi/thunk/ppb_char_set_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_char_set_thunk.cc b/ppapi/thunk/ppb_char_set_thunk.cc
|
| index a663c55dd4a0d57f1ac2042a8e58449c8295ef63..aa38ae93473358b72c9e447de3dee5610b4dc688 100644
|
| --- a/ppapi/thunk/ppb_char_set_thunk.cc
|
| +++ b/ppapi/thunk/ppb_char_set_thunk.cc
|
| @@ -13,7 +13,8 @@ namespace thunk {
|
| namespace {
|
|
|
| char* UTF16ToCharSetDeprecated(PP_Instance instance,
|
| - const uint16_t* utf16, uint32_t utf16_len,
|
| + const uint16_t* utf16,
|
| + uint32_t utf16_len,
|
| const char* output_char_set,
|
| PP_CharSet_ConversionError on_error,
|
| uint32_t* output_length) {
|
| @@ -43,13 +44,17 @@ PP_Bool UTF16ToCharSet(const uint16_t utf16[],
|
| // shared_impl. That would be more consistent, and we may want to do that if
|
| // this file is autogenerated in the future. For now, however, it's less code
|
| // to just call the shared_impl code directly here.
|
| - return PPB_CharSet_Shared::UTF16ToCharSet(
|
| - utf16, utf16_len, output_char_set, on_error,
|
| - output_buffer, output_length);
|
| + return PPB_CharSet_Shared::UTF16ToCharSet(utf16,
|
| + utf16_len,
|
| + output_char_set,
|
| + on_error,
|
| + output_buffer,
|
| + output_length);
|
| }
|
|
|
| uint16_t* CharSetToUTF16Deprecated(PP_Instance instance,
|
| - const char* input, uint32_t input_len,
|
| + const char* input,
|
| + uint32_t input_len,
|
| const char* input_char_set,
|
| PP_CharSet_ConversionError on_error,
|
| uint32_t* output_length) {
|
| @@ -69,9 +74,12 @@ PP_Bool CharSetToUTF16(const char* input,
|
| PP_CharSet_Trusted_ConversionError on_error,
|
| uint16_t* output_buffer,
|
| uint32_t* output_utf16_length) {
|
| - return PPB_CharSet_Shared::CharSetToUTF16(
|
| - input, input_len, input_char_set, on_error,
|
| - output_buffer, output_utf16_length);
|
| + return PPB_CharSet_Shared::CharSetToUTF16(input,
|
| + input_len,
|
| + input_char_set,
|
| + on_error,
|
| + output_buffer,
|
| + output_utf16_length);
|
| }
|
|
|
| PP_Var GetDefaultCharSet(PP_Instance instance) {
|
| @@ -82,16 +90,10 @@ PP_Var GetDefaultCharSet(PP_Instance instance) {
|
| }
|
|
|
| const PPB_CharSet_Dev g_ppb_char_set_thunk = {
|
| - &UTF16ToCharSetDeprecated,
|
| - &CharSetToUTF16Deprecated,
|
| - &GetDefaultCharSet
|
| -};
|
| + &UTF16ToCharSetDeprecated, &CharSetToUTF16Deprecated, &GetDefaultCharSet};
|
|
|
| const PPB_CharSet_Trusted_1_0 g_ppb_char_set_trusted_thunk = {
|
| - &UTF16ToCharSet,
|
| - &CharSetToUTF16,
|
| - &GetDefaultCharSet
|
| -};
|
| + &UTF16ToCharSet, &CharSetToUTF16, &GetDefaultCharSet};
|
|
|
| } // namespace
|
|
|
|
|