Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: ppapi/c/ppb_ime_input_event.h

Issue 18671004: PPAPI: Move IMEInputEvent and TextInput to stable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/c/ppb_ime_input_event.h
diff --git a/ppapi/c/dev/ppb_ime_input_event_dev.h b/ppapi/c/ppb_ime_input_event.h
similarity index 78%
rename from ppapi/c/dev/ppb_ime_input_event_dev.h
rename to ppapi/c/ppb_ime_input_event.h
index 590a1d96e189bf4555b3615acd4c96ce80a59cbe..e4d1b3b8cbe1c47f40811e30fdcc8776faae76a3 100644
--- a/ppapi/c/dev/ppb_ime_input_event_dev.h
+++ b/ppapi/c/ppb_ime_input_event.h
@@ -3,10 +3,10 @@
* found in the LICENSE file.
*/
-/* From dev/ppb_ime_input_event_dev.idl modified Wed May 16 17:08:03 2012. */
+/* From ppb_ime_input_event.idl modified Wed Jul 17 13:59:01 2013. */
-#ifndef PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_
-#define PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_
+#ifndef PPAPI_C_PPB_IME_INPUT_EVENT_H_
+#define PPAPI_C_PPB_IME_INPUT_EVENT_H_
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_instance.h"
@@ -17,13 +17,12 @@
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_input_event.h"
-#define PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1 "PPB_IMEInputEvent(Dev);0.1"
-#define PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2 "PPB_IMEInputEvent(Dev);0.2"
-#define PPB_IME_INPUT_EVENT_DEV_INTERFACE PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2
+#define PPB_IME_INPUT_EVENT_INTERFACE_1_0 "PPB_IMEInputEvent;1.0"
+#define PPB_IME_INPUT_EVENT_INTERFACE PPB_IME_INPUT_EVENT_INTERFACE_1_0
/**
* @file
- * This file defines the <code>PPB_IMEInputEvent_Dev</code> interface.
+ * This file defines the <code>PPB_IMEInputEvent</code> interface.
*/
@@ -31,7 +30,7 @@
* @addtogroup Interfaces
* @{
*/
-struct PPB_IMEInputEvent_Dev_0_2 {
+struct PPB_IMEInputEvent_1_0 {
/**
* Create() creates an IME input event with the given parameters. Normally
* you will get an IME event passed through the <code>HandleInputEvent</code>
@@ -49,7 +48,7 @@ struct PPB_IMEInputEvent_Dev_0_2 {
* @param[in] text The string returned by <code>GetText</code>.
*
* @param[in] segment_number The number returned by
- * <code>GetSegmentNumber</code>.
+ * <code>GetSegmentCount</code>.
*
* @param[in] segment_offsets The array of numbers returned by
* <code>GetSegmentOffset</code>. If <code>segment_number</code> is zero,
@@ -97,7 +96,7 @@ struct PPB_IMEInputEvent_Dev_0_2 {
*/
struct PP_Var (*GetText)(PP_Resource ime_event);
/**
- * GetSegmentNumber() returns the number of segments in the composition text.
+ * GetSegmentCount() returns the number of segments in the composition text.
*
* @param[in] ime_event A <code>PP_Resource</code> corresponding to an IME
* event.
@@ -105,15 +104,15 @@ struct PPB_IMEInputEvent_Dev_0_2 {
* @return The number of segments. For events other than COMPOSITION_UPDATE,
* returns 0.
*/
- uint32_t (*GetSegmentNumber)(PP_Resource ime_event);
+ uint32_t (*GetSegmentCount)(PP_Resource ime_event);
/**
* GetSegmentOffset() returns the position of the index-th segmentation point
* in the composition text. The position is given by a byte-offset (not a
* character-offset) of the string returned by GetText(). It always satisfies
* 0=GetSegmentOffset(0) < ... < GetSegmentOffset(i) < GetSegmentOffset(i+1)
- * < ... < GetSegmentOffset(GetSegmentNumber())=(byte-length of GetText()).
+ * < ... < GetSegmentOffset(GetSegmentCount())=(byte-length of GetText()).
* Note that [GetSegmentOffset(i), GetSegmentOffset(i+1)) represents the range
- * of the i-th segment, and hence GetSegmentNumber() can be a valid argument
+ * of the i-th segment, and hence GetSegmentCount() can be a valid argument
* to this function instead of an off-by-1 error.
*
* @param[in] ime_event A <code>PP_Resource</code> corresponding to an IME
@@ -150,19 +149,10 @@ struct PPB_IMEInputEvent_Dev_0_2 {
void (*GetSelection)(PP_Resource ime_event, uint32_t* start, uint32_t* end);
};
-typedef struct PPB_IMEInputEvent_Dev_0_2 PPB_IMEInputEvent_Dev;
-
-struct PPB_IMEInputEvent_Dev_0_1 {
- PP_Bool (*IsIMEInputEvent)(PP_Resource resource);
- struct PP_Var (*GetText)(PP_Resource ime_event);
- uint32_t (*GetSegmentNumber)(PP_Resource ime_event);
- uint32_t (*GetSegmentOffset)(PP_Resource ime_event, uint32_t index);
- int32_t (*GetTargetSegment)(PP_Resource ime_event);
- void (*GetSelection)(PP_Resource ime_event, uint32_t* start, uint32_t* end);
-};
+typedef struct PPB_IMEInputEvent_1_0 PPB_IMEInputEvent;
/**
* @}
*/
-#endif /* PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_ */
+#endif /* PPAPI_C_PPB_IME_INPUT_EVENT_H_ */

Powered by Google App Engine
This is Rietveld 408576698