summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp/dev/ime_input_event_dev.cc
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 08:35:55 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 08:35:55 +0000
commit40fbffa6a1d8cc0aa6adb8e71725fea954d0eb17 (patch)
tree5e37fa314f54e15dd72c9a28cb1bad463800a00e /ppapi/cpp/dev/ime_input_event_dev.cc
parenta5bd413ae6ca86fce6922fcd19c111eaeb7232f4 (diff)
downloadchromium_src-40fbffa6a1d8cc0aa6adb8e71725fea954d0eb17.zip
chromium_src-40fbffa6a1d8cc0aa6adb8e71725fea954d0eb17.tar.gz
chromium_src-40fbffa6a1d8cc0aa6adb8e71725fea954d0eb17.tar.bz2
Revert 102897 - 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 TBR=kinaba@chromium.org Review URL: http://codereview.chromium.org/8060005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/dev/ime_input_event_dev.cc')
-rw-r--r--ppapi/cpp/dev/ime_input_event_dev.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/ppapi/cpp/dev/ime_input_event_dev.cc b/ppapi/cpp/dev/ime_input_event_dev.cc
index bc1f387..21fe879 100644
--- a/ppapi/cpp/dev/ime_input_event_dev.cc
+++ b/ppapi/cpp/dev/ime_input_event_dev.cc
@@ -49,11 +49,16 @@ uint32_t IMEInputEvent_Dev::GetSegmentNumber() const {
pp_resource());
}
-uint32_t IMEInputEvent_Dev::GetSegmentOffset(uint32_t index) const {
+std::pair<uint32_t, uint32_t>
+IMEInputEvent_Dev::GetSegmentAt(uint32_t index) const {
+ std::pair<uint32_t, uint32_t> range(0, 0);
if (!has_interface<PPB_IMEInputEvent_Dev>())
- return 0;
- return get_interface<PPB_IMEInputEvent_Dev>()->GetSegmentOffset(pp_resource(),
- index);
+ return range;
+ get_interface<PPB_IMEInputEvent_Dev>()->GetSegmentAt(pp_resource(),
+ index,
+ &range.first,
+ &range.second);
+ return range;
}
int32_t IMEInputEvent_Dev::GetTargetSegment() const {