Index: ppapi/c/ppb_text_input.h |
diff --git a/ppapi/c/dev/ppb_text_input_dev.h b/ppapi/c/ppb_text_input.h |
similarity index 78% |
rename from ppapi/c/dev/ppb_text_input_dev.h |
rename to ppapi/c/ppb_text_input.h |
index 8b7df4425c93f007dc1e59b935b97d7ab184387d..3018c000ffddc61043f8a49a79438bc17aa30286 100644 |
--- a/ppapi/c/dev/ppb_text_input_dev.h |
+++ b/ppapi/c/ppb_text_input.h |
@@ -3,10 +3,10 @@ |
* found in the LICENSE file. |
*/ |
-/* From dev/ppb_text_input_dev.idl modified Thu Mar 28 10:54:47 2013. */ |
+/* From ppb_text_input.idl modified Tue Jul 16 14:52:11 2013. */ |
-#ifndef PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_ |
-#define PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_ |
+#ifndef PPAPI_C_PPB_TEXT_INPUT_H_ |
+#define PPAPI_C_PPB_TEXT_INPUT_H_ |
#include "ppapi/c/pp_instance.h" |
#include "ppapi/c/pp_macros.h" |
@@ -15,13 +15,12 @@ |
#include "ppapi/c/pp_size.h" |
#include "ppapi/c/pp_stdint.h" |
-#define PPB_TEXTINPUT_DEV_INTERFACE_0_1 "PPB_TextInput(Dev);0.1" |
-#define PPB_TEXTINPUT_DEV_INTERFACE_0_2 "PPB_TextInput(Dev);0.2" |
-#define PPB_TEXTINPUT_DEV_INTERFACE PPB_TEXTINPUT_DEV_INTERFACE_0_2 |
+#define PPB_TEXTINPUT_INTERFACE_1_0 "PPB_TextInput;1.0" |
+#define PPB_TEXTINPUT_INTERFACE PPB_TEXTINPUT_INTERFACE_1_0 |
/** |
* @file |
- * This file defines the <code>PPB_TextInput_Dev</code> interface. |
+ * This file defines the <code>PPB_TextInput</code> interface. |
*/ |
@@ -63,11 +62,11 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TextInput_Type, 4); |
* @{ |
*/ |
/** |
- * <code>PPB_TextInput_Dev</code> provides a set of functions for giving hints |
+ * <code>PPB_TextInput</code> provides a set of functions for giving hints |
* to the browser about the text input status of plugins, and functions for |
* controlling input method editors (IMEs). |
*/ |
-struct PPB_TextInput_Dev_0_2 { |
+struct PPB_TextInput_1_0 { |
/** |
* Informs the browser about the current text input mode of the plugin. |
* Typical use of this information in the browser is to properly |
@@ -89,7 +88,7 @@ struct PPB_TextInput_Dev_0_2 { |
*/ |
void (*CancelCompositionText)(PP_Instance instance); |
/** |
- * In response to the <code>PPP_TextInput_Dev::RequestSurroundingText</code> |
+ * In response to the <code>PPP_TextInput::RequestSurroundingText</code> |
* call, informs the browser about the current text selection and surrounding |
* text. <code>text</code> is a UTF-8 string that contains the current range |
* of text selection in the plugin. <code>caret</code> is the byte-index of |
@@ -118,25 +117,17 @@ struct PPB_TextInput_Dev_0_2 { |
/** |
* Informs the browser when a range of text selection is changed in a plugin. |
* When the browser needs to know the content of the updated selection, it |
- * pings back by <code>PPP_TextInput_Dev::RequestSurroundingText</code>. The |
+ * pings back by <code>PPP_TextInput::RequestSurroundingText</code>. The |
* plugin then should send the information with |
* <code>UpdateSurroundingText</code>. |
*/ |
void (*SelectionChanged)(PP_Instance instance); |
}; |
-typedef struct PPB_TextInput_Dev_0_2 PPB_TextInput_Dev; |
- |
-struct PPB_TextInput_Dev_0_1 { |
- 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); |
-}; |
+typedef struct PPB_TextInput_1_0 PPB_TextInput; |
/** |
* @} |
*/ |
-#endif /* PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_ */ |
+#endif /* PPAPI_C_PPB_TEXT_INPUT_H_ */ |