diff options
author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 08:22:03 +0000 |
---|---|---|
committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 08:22:03 +0000 |
commit | a5bd413ae6ca86fce6922fcd19c111eaeb7232f4 (patch) | |
tree | 53e953e110155169b190daff3ca8721661ae9516 /ppapi/api | |
parent | bec2695b1a4faad59f6c71d777032af5f04042bc (diff) | |
download | chromium_src-a5bd413ae6ca86fce6922fcd19c111eaeb7232f4.zip chromium_src-a5bd413ae6ca86fce6922fcd19c111eaeb7232f4.tar.gz chromium_src-a5bd413ae6ca86fce6922fcd19c111eaeb7232f4.tar.bz2 |
Additional update on Pepper IME API and boilerplate thunk/proxy implementation.
BUG=59425
TEST=Check that ppapi_tests compile.
This CL is the second (out of three) part for adding IME support for PPAPI.
It reflects comments from James Su to the previous CL:
http://codereview.chromium.org/7882004.
- Renamed ..._COMPOSTION_START to _IME_COMPOSITON_START.
- Changed to assure GetSegment to return a strictly increasing sequence of
segmentation points from 0 to the length.
and,
- Added the mostly boilerplate code for interfacing with
in-process & out-of-process plugins.
The actual implementation of the IME support will come as
the next and the last part of this series of patches.
Review URL: http://codereview.chromium.org/7978019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/api')
-rw-r--r-- | ppapi/api/dev/ppb_ime_input_event_dev.idl | 29 | ||||
-rw-r--r-- | ppapi/api/dev/ppb_text_input_dev.idl | 4 | ||||
-rw-r--r-- | ppapi/api/ppb_input_event.idl | 6 |
3 files changed, 15 insertions, 24 deletions
diff --git a/ppapi/api/dev/ppb_ime_input_event_dev.idl b/ppapi/api/dev/ppb_ime_input_event_dev.idl index 6899008..6f484e2 100644 --- a/ppapi/api/dev/ppb_ime_input_event_dev.idl +++ b/ppapi/api/dev/ppb_ime_input_event_dev.idl @@ -46,30 +46,25 @@ interface PPB_IMEInputEvent_Dev { uint32_t GetSegmentNumber([in] PP_Resource ime_event); /** - * GetSegmentAt() returns the start and the end position of the index-th - * segment in the composition text. The positions are given by byte-offsets - * (not character-offsets) of the string returned by GetText(). The range of - * the segment extends from start (inclusive) to end (exclusive). They satisfy - * 0 <= start < end <= (byte-length of GetText()). When the event is not - * COMPOSITION_UPDATE or index >= GetSegmentNumber(), the function returns - * PP_FALSE and nothing else happens. + * 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()). + * Note that [GetSegmentOffset(i), GetSegmentOffset(i+1)) represents the range + * of the i-th segment, and hence GetSegmentNumber() 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 * event. * * @param[in] index An integer indicating a segment. * - * @param[out] start The start position of the index-th segment. - * - * @param[out] end The end position of the index-th segment. - * - * @return PP_TRUE when the start and the end position is successfully - * obtained, and PP_FALSE otherwise. + * @return The byte-offset of the segmentation point. If the event is not + * COMPOSITION_UPDATE or index is out of range, returns 0. */ - PP_Bool GetSegmentAt([in] PP_Resource ime_event, - [in] uint32_t index, - [out] uint32_t start, - [out] uint32_t end); + uint32_t GetSegmentOffset([in] PP_Resource ime_event, + [in] uint32_t index); /** * GetTargetSegment() returns the index of the current target segment of diff --git a/ppapi/api/dev/ppb_text_input_dev.idl b/ppapi/api/dev/ppb_text_input_dev.idl index f534b65..be4065e 100644 --- a/ppapi/api/dev/ppb_text_input_dev.idl +++ b/ppapi/api/dev/ppb_text_input_dev.idl @@ -61,10 +61,6 @@ interface PPB_TextInput_Dev { void UpdateCaretPosition([in] PP_Instance instance, [in] PP_Rect caret, [in] PP_Rect bounding_box); - /** - * Forces to commit the current composition text in IME. - */ - void ConfirmCompositionText([in] PP_Instance instance); /** * Cancels the current composition in IME. diff --git a/ppapi/api/ppb_input_event.idl b/ppapi/api/ppb_input_event.idl index 1f95a86..98fa7b0 100644 --- a/ppapi/api/ppb_input_event.idl +++ b/ppapi/api/ppb_input_event.idl @@ -107,21 +107,21 @@ enum PP_InputEvent_Type { * * Register for this event using the PP_INPUTEVENT_CLASS_IME class. */ - PP_INPUTEVENT_TYPE_COMPOSITION_START = 11, + PP_INPUTEVENT_TYPE_IME_COMPOSITION_START = 11, /** * Notification that the input method composition string is updated. * * Register for this event using the PP_INPUTEVENT_CLASS_IME class. */ - PP_INPUTEVENT_TYPE_COMPOSITION_UPDATE = 12, + PP_INPUTEVENT_TYPE_IME_COMPOSITION_UPDATE = 12, /** * Notification that an input method composition process has completed. * * Register for this event using the PP_INPUTEVENT_CLASS_IME class. */ - PP_INPUTEVENT_TYPE_COMPOSITION_END = 13, + PP_INPUTEVENT_TYPE_IME_COMPOSITION_END = 13, /** * Notification that an input method committed a string. |