| Index: ppapi/thunk/ppb_text_input_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_text_input_thunk.cc b/ppapi/thunk/ppb_text_input_thunk.cc
|
| index a59146bd1f7b98ed18896231d7697af696087b06..65a014107b3e982624c4da351991e51ebd7551d1 100644
|
| --- a/ppapi/thunk/ppb_text_input_thunk.cc
|
| +++ b/ppapi/thunk/ppb_text_input_thunk.cc
|
| @@ -19,20 +19,20 @@ COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_NONE) == int(PP_TEXTINPUT_TYPE_NONE),
|
| mismatching_enums);
|
| COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_TEXT) == int(PP_TEXTINPUT_TYPE_TEXT),
|
| mismatching_enums);
|
| -COMPILE_ASSERT(
|
| - int(PP_TEXTINPUT_TYPE_DEV_PASSWORD) == int(PP_TEXTINPUT_TYPE_PASSWORD),
|
| - mismatching_enums);
|
| -COMPILE_ASSERT(
|
| - int(PP_TEXTINPUT_TYPE_DEV_SEARCH) == int(PP_TEXTINPUT_TYPE_SEARCH),
|
| - mismatching_enums);
|
| +COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_PASSWORD) ==
|
| + int(PP_TEXTINPUT_TYPE_PASSWORD),
|
| + mismatching_enums);
|
| +COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_SEARCH) ==
|
| + int(PP_TEXTINPUT_TYPE_SEARCH),
|
| + mismatching_enums);
|
| COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_EMAIL) == int(PP_TEXTINPUT_TYPE_EMAIL),
|
| mismatching_enums);
|
| -COMPILE_ASSERT(
|
| - int(PP_TEXTINPUT_TYPE_DEV_NUMBER) == int(PP_TEXTINPUT_TYPE_NUMBER),
|
| - mismatching_enums);
|
| -COMPILE_ASSERT(
|
| - int(PP_TEXTINPUT_TYPE_DEV_TELEPHONE) == int(PP_TEXTINPUT_TYPE_TELEPHONE),
|
| - mismatching_enums);
|
| +COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_NUMBER) ==
|
| + int(PP_TEXTINPUT_TYPE_NUMBER),
|
| + mismatching_enums);
|
| +COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_TELEPHONE) ==
|
| + int(PP_TEXTINPUT_TYPE_TELEPHONE),
|
| + mismatching_enums);
|
| COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_URL) == int(PP_TEXTINPUT_TYPE_URL),
|
| mismatching_enums);
|
|
|
| @@ -50,15 +50,14 @@ void SetTextInputType_0_2(PP_Instance instance, PP_TextInput_Type_Dev type) {
|
| }
|
|
|
| void UpdateCaretPosition_0_2(PP_Instance instance,
|
| - const PP_Rect* caret,
|
| - const PP_Rect* bounding_box) {
|
| + const PP_Rect* caret,
|
| + const PP_Rect* bounding_box) {
|
| EnterInstance enter(instance);
|
| if (enter.succeeded() && caret && bounding_box)
|
| enter.functions()->UpdateCaretPosition(instance, *caret, *bounding_box);
|
| }
|
|
|
| -void UpdateCaretPosition(PP_Instance instance,
|
| - const PP_Rect* caret) {
|
| +void UpdateCaretPosition(PP_Instance instance, const PP_Rect* caret) {
|
| EnterInstance enter(instance);
|
| if (enter.succeeded() && caret)
|
| enter.functions()->UpdateCaretPosition(instance, *caret, PP_Rect());
|
| @@ -70,22 +69,24 @@ void CancelCompositionText(PP_Instance instance) {
|
| enter.functions()->CancelCompositionText(instance);
|
| }
|
|
|
| -void UpdateSurroundingText_0_2(PP_Instance instance, const char* text,
|
| - uint32_t caret, uint32_t anchor) {
|
| +void UpdateSurroundingText_0_2(PP_Instance instance,
|
| + const char* text,
|
| + uint32_t caret,
|
| + uint32_t anchor) {
|
| EnterInstance enter(instance);
|
| if (enter.succeeded())
|
| enter.functions()->UpdateSurroundingText(instance, text, caret, anchor);
|
| }
|
|
|
| -void UpdateSurroundingText_1_0(PP_Instance instance, PP_Var text,
|
| - uint32_t caret, uint32_t anchor) {
|
| +void UpdateSurroundingText_1_0(PP_Instance instance,
|
| + PP_Var text,
|
| + uint32_t caret,
|
| + uint32_t anchor) {
|
| EnterInstance enter(instance);
|
| StringVar* var = StringVar::FromPPVar(text);
|
| if (enter.succeeded() && var)
|
| - enter.functions()->UpdateSurroundingText(instance,
|
| - var->value().c_str(),
|
| - caret,
|
| - anchor);
|
| + enter.functions()->UpdateSurroundingText(
|
| + instance, var->value().c_str(), caret, anchor);
|
| }
|
|
|
| void SelectionChanged(PP_Instance instance) {
|
| @@ -95,25 +96,16 @@ void SelectionChanged(PP_Instance instance) {
|
| }
|
|
|
| const PPB_TextInput_Dev_0_1 g_ppb_textinput_0_1_thunk = {
|
| - &SetTextInputType_0_2,
|
| - &UpdateCaretPosition_0_2,
|
| - &CancelCompositionText,
|
| -};
|
| + &SetTextInputType_0_2, &UpdateCaretPosition_0_2, &CancelCompositionText, };
|
|
|
| const PPB_TextInput_Dev_0_2 g_ppb_textinput_0_2_thunk = {
|
| - &SetTextInputType_0_2,
|
| - &UpdateCaretPosition_0_2,
|
| - &CancelCompositionText,
|
| - &UpdateSurroundingText_0_2,
|
| - &SelectionChanged,
|
| -};
|
| + &SetTextInputType_0_2, &UpdateCaretPosition_0_2,
|
| + &CancelCompositionText, &UpdateSurroundingText_0_2,
|
| + &SelectionChanged, };
|
|
|
| const PPB_TextInputController_1_0 g_ppb_textinputcontroller_1_0_thunk = {
|
| - &SetTextInputType,
|
| - &UpdateCaretPosition,
|
| - &CancelCompositionText,
|
| - &UpdateSurroundingText_1_0,
|
| -};
|
| + &SetTextInputType, &UpdateCaretPosition, &CancelCompositionText,
|
| + &UpdateSurroundingText_1_0, };
|
|
|
| } // namespace
|
|
|
|
|