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

Unified Diff: ppapi/thunk/ppb_text_input_thunk.cc

Issue 18671004: PPAPI: Move IMEInputEvent and TextInput to stable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nitpick 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/thunk/ppb_text_input_thunk.cc
diff --git a/ppapi/thunk/ppb_text_input_thunk.cc b/ppapi/thunk/ppb_text_input_thunk.cc
index 7d35e2a799fbb3f8b1e1b54b14182fc49233798b..eb571096515edd95d3a76170e049e4e83204e201 100644
--- a/ppapi/thunk/ppb_text_input_thunk.cc
+++ b/ppapi/thunk/ppb_text_input_thunk.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ppapi/c/ppb_text_input_controller.h"
+
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/thunk.h"
#include "ppapi/thunk/ppb_instance_api.h"
@@ -17,7 +19,7 @@ void SetTextInputType(PP_Instance instance, PP_TextInput_Type type) {
enter.functions()->SetTextInputType(instance, type);
}
-void UpdateCaretPosition(PP_Instance instance,
+void UpdateCaretPosition_0_2(PP_Instance instance,
const PP_Rect* caret,
const PP_Rect* bounding_box) {
EnterInstance enter(instance);
@@ -25,6 +27,13 @@ void UpdateCaretPosition(PP_Instance instance,
enter.functions()->UpdateCaretPosition(instance, *caret, *bounding_box);
}
+void UpdateCaretPosition(PP_Instance instance,
+ const PP_Rect* caret) {
+ EnterInstance enter(instance);
+ if (enter.succeeded() && caret)
+ enter.functions()->UpdateCaretPosition(instance, *caret, PP_Rect());
+}
+
void CancelCompositionText(PP_Instance instance) {
EnterInstance enter(instance);
if (enter.succeeded())
@@ -46,18 +55,25 @@ void SelectionChanged(PP_Instance instance) {
const PPB_TextInput_Dev_0_1 g_ppb_textinput_0_1_thunk = {
&SetTextInputType,
- &UpdateCaretPosition,
+ &UpdateCaretPosition_0_2,
&CancelCompositionText,
};
-const PPB_TextInput_Dev g_ppb_textinput_0_2_thunk = {
+const PPB_TextInput_Dev_0_2 g_ppb_textinput_0_2_thunk = {
&SetTextInputType,
- &UpdateCaretPosition,
+ &UpdateCaretPosition_0_2,
&CancelCompositionText,
&UpdateSurroundingText,
&SelectionChanged,
};
+const PPB_TextInputController_1_0 g_ppb_textinputcontroller_1_0_thunk = {
+ &SetTextInputType,
+ &UpdateCaretPosition,
+ &CancelCompositionText,
+ &UpdateSurroundingText,
+};
+
} // namespace
const PPB_TextInput_Dev_0_1* GetPPB_TextInput_Dev_0_1_Thunk() {
@@ -68,5 +84,9 @@ const PPB_TextInput_Dev_0_2* GetPPB_TextInput_Dev_0_2_Thunk() {
return &g_ppb_textinput_0_2_thunk;
}
+const PPB_TextInputController_1_0* GetPPB_TextInputController_1_0_Thunk() {
+ return &g_ppb_textinputcontroller_1_0_thunk;
+}
+
} // namespace thunk
} // namespace ppapi

Powered by Google App Engine
This is Rietveld 408576698