| Index: ppapi/api/ppb_ime_input_event.idl
|
| diff --git a/ppapi/api/dev/ppb_ime_input_event_dev.idl b/ppapi/api/ppb_ime_input_event.idl
|
| similarity index 90%
|
| rename from ppapi/api/dev/ppb_ime_input_event_dev.idl
|
| rename to ppapi/api/ppb_ime_input_event.idl
|
| index 9e728d6ed049fcf5d7bd659c8fb9fe6df0603b7c..8ad5b1d11d2ee87cb9a8f2348c336f6e49aacde7 100644
|
| --- a/ppapi/api/dev/ppb_ime_input_event_dev.idl
|
| +++ b/ppapi/api/ppb_ime_input_event.idl
|
| @@ -4,16 +4,15 @@
|
| */
|
|
|
| /**
|
| - * This file defines the <code>PPB_IMEInputEvent_Dev</code> interface.
|
| + * This file defines the <code>PPB_IMEInputEvent</code> interface.
|
| */
|
|
|
| label Chrome {
|
| - M16 = 0.1,
|
| - M21 = 0.2
|
| + M30 = 1.0
|
| };
|
|
|
| -[macro="PPB_IME_INPUT_EVENT_DEV_INTERFACE"]
|
| -interface PPB_IMEInputEvent_Dev {
|
| +[macro="PPB_IME_INPUT_EVENT_INTERFACE"]
|
| +interface PPB_IMEInputEvent {
|
| /**
|
| * Create() creates an IME input event with the given parameters. Normally
|
| * you will get an IME event passed through the <code>HandleInputEvent</code>
|
| @@ -31,7 +30,7 @@ interface PPB_IMEInputEvent_Dev {
|
| * @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,
|
| @@ -83,7 +82,7 @@ interface PPB_IMEInputEvent_Dev {
|
| PP_Var GetText([in] 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.
|
| @@ -91,16 +90,16 @@ interface PPB_IMEInputEvent_Dev {
|
| * @return The number of segments. For events other than COMPOSITION_UPDATE,
|
| * returns 0.
|
| */
|
| - uint32_t GetSegmentNumber([in] PP_Resource ime_event);
|
| + uint32_t GetSegmentCount([in] 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
|
|
|