summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi/event_conversion.cc
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 04:23:09 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 04:23:09 +0000
commit2daba2f3623744b78f1880d8ebb0a673d03f52d3 (patch)
tree5bdad577cacfe4147ffceddcb1b1d0e1b6955232 /webkit/plugins/ppapi/event_conversion.cc
parent47d09f6e03e6d8ee179e479095c5afd9564921e0 (diff)
downloadchromium_src-2daba2f3623744b78f1880d8ebb0a673d03f52d3.zip
chromium_src-2daba2f3623744b78f1880d8ebb0a673d03f52d3.tar.gz
chromium_src-2daba2f3623744b78f1880d8ebb0a673d03f52d3.tar.bz2
Additional update on Pepper IME API and boilerplate thunk/proxy implementation.
BUG=59425 TEST=Check that ppapi_tests compile (with GYP_DEFINES=shared_library, too). 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/8059006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/event_conversion.cc')
-rw-r--r--webkit/plugins/ppapi/event_conversion.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc
index 80df1f6..cec3a64 100644
--- a/webkit/plugins/ppapi/event_conversion.cc
+++ b/webkit/plugins/ppapi/event_conversion.cc
@@ -302,9 +302,9 @@ WebInputEvent* CreateWebInputEvent(const InputEventData& event) {
case PP_INPUTEVENT_TYPE_CHAR:
web_input_event.reset(BuildCharEvent(event));
break;
- case PP_INPUTEVENT_TYPE_COMPOSITION_START:
- case PP_INPUTEVENT_TYPE_COMPOSITION_UPDATE:
- case PP_INPUTEVENT_TYPE_COMPOSITION_END:
+ case PP_INPUTEVENT_TYPE_IME_COMPOSITION_START:
+ case PP_INPUTEVENT_TYPE_IME_COMPOSITION_UPDATE:
+ case PP_INPUTEVENT_TYPE_IME_COMPOSITION_END:
case PP_INPUTEVENT_TYPE_IME_TEXT:
// TODO(kinaba) implement in WebKit an event structure to handle
// composition events.