| 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 7d35e2a799fbb3f8b1e1b54b14182fc49233798b..06fbda16dba19239239731d6e3864061eaae943c 100644
|
| --- a/ppapi/thunk/ppb_text_input_thunk.cc
|
| +++ b/ppapi/thunk/ppb_text_input_thunk.cc
|
| @@ -6,6 +6,21 @@
|
| #include "ppapi/thunk/thunk.h"
|
| #include "ppapi/thunk/ppb_instance_api.h"
|
|
|
| +// This struct is for ABI compatibility for PPAPI Flash and PDF plugin.
|
| +// TODO(nona): Remove once Flash and PDF plugin support TextInput1.0.
|
| +struct PPB_TextInput_Dev_0_2 {
|
| + void (*SetTextInputType)(PP_Instance instance, PP_TextInput_Type type);
|
| + void (*UpdateCaretPosition)(PP_Instance instance,
|
| + const struct PP_Rect* caret,
|
| + const struct PP_Rect* bounding_box);
|
| + void (*CancelCompositionText)(PP_Instance instance);
|
| + void (*UpdateSurroundingText)(PP_Instance instance,
|
| + const char* text,
|
| + uint32_t caret,
|
| + uint32_t anchor);
|
| + void (*SelectionChanged)(PP_Instance instance);
|
| +};
|
| +
|
| namespace ppapi {
|
| namespace thunk {
|
|
|
| @@ -44,13 +59,16 @@ void SelectionChanged(PP_Instance instance) {
|
| enter.functions()->SelectionChanged(instance);
|
| }
|
|
|
| -const PPB_TextInput_Dev_0_1 g_ppb_textinput_0_1_thunk = {
|
| +const PPB_TextInput g_ppb_textinput_1_0_thunk = {
|
| &SetTextInputType,
|
| &UpdateCaretPosition,
|
| &CancelCompositionText,
|
| + &UpdateSurroundingText,
|
| + &SelectionChanged,
|
| };
|
|
|
| -const PPB_TextInput_Dev g_ppb_textinput_0_2_thunk = {
|
| +// TODO(nona): Remove once Flash and PDF support TextInput1.0.
|
| +const PPB_TextInput_Dev_0_2 g_ppb_textinput_dev_0_2_thunk = {
|
| &SetTextInputType,
|
| &UpdateCaretPosition,
|
| &CancelCompositionText,
|
| @@ -60,12 +78,13 @@ const PPB_TextInput_Dev g_ppb_textinput_0_2_thunk = {
|
|
|
| } // namespace
|
|
|
| -const PPB_TextInput_Dev_0_1* GetPPB_TextInput_Dev_0_1_Thunk() {
|
| - return &g_ppb_textinput_0_1_thunk;
|
| +const PPB_TextInput* GetPPB_TextInput_1_0_Thunk() {
|
| + return &g_ppb_textinput_1_0_thunk;
|
| }
|
|
|
| +// TODO(nona): Remove once Flash and PDF support TextInput1.0.
|
| const PPB_TextInput_Dev_0_2* GetPPB_TextInput_Dev_0_2_Thunk() {
|
| - return &g_ppb_textinput_0_2_thunk;
|
| + return &g_ppb_textinput_dev_0_2_thunk;
|
| }
|
|
|
| } // namespace thunk
|
|
|