PPAPI: Move IMEInputEvent and TextInput to stable.

ppapi/thunk/ppb_input_event_thunk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_input_event_api.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
+// This struct is for ABI compatibility for PPAPI Flash and PDF plugin.
+// TODO(nona): Remove once Flash and PDF support IMEInputEvent1.0.
+struct PPB_IMEInputEvent_Dev_0_2 {

[dmichael (off chromium), 2013/07/18 03:50:20]

I'd really prefer if we just kept the old IDL around and used this there. Is
there a reason not to do it the same we we do all our other backwards
compatibility?

(It's also possible that the non-dev version will change in the course of taking
this out of Dev, so doing it the usual way is more resilient to that)

[Seigo Nonaka, 2013/07/23 11:49:54]

Sure, I revert dev IDLs.

On 2013/07/18 03:50:20, dmichael wrote:

+  PP_Resource (*Create)(PP_Instance instance,
+                        PP_InputEvent_Type type,
+                        PP_TimeTicks time_stamp,
+                        struct PP_Var text,
+                        uint32_t segment_number,
+                        const uint32_t segment_offsets[],
+                        int32_t target_segment,
+                        uint32_t selection_start,
+                        uint32_t selection_end);
+  PP_Bool (*IsIMEInputEvent)(PP_Resource resource);
+  struct PP_Var (*GetText)(PP_Resource ime_event);
+  uint32_t (*GetSegmentCount)(PP_Resource ime_event);
+  uint32_t (*GetSegmentOffset)(PP_Resource ime_event, uint32_t index);
+  int32_t (*GetTargetSegment)(PP_Resource ime_event);
+  void (*GetSelection)(PP_Resource ime_event, uint32_t* start, uint32_t* end);
+};
+
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
 typedef EnterResource<PPB_InputEvent_API> EnterInputEvent;
 
 // InputEvent ------------------------------------------------------------------
 
 int32_t RequestInputEvents(PP_Instance instance, uint32_t event_classes) {
@@ skipping 298 matching lines @@
 
 PP_Resource CreateIMEInputEvent(PP_Instance instance,
                                 PP_InputEvent_Type type,
                                 PP_TimeTicks time_stamp,
                                 PP_Var text,
                                 uint32_t segment_number,
                                 const uint32_t segment_offsets[],
                                 int32_t target_segment,
                                 uint32_t selection_start,
                                 uint32_t selection_end) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::Create()";
+  VLOG(4) << "PPB_IMEInputEvent::Create()";
   EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateIMEInputEvent(instance, type, time_stamp,
                                                 text, segment_number,
                                                 segment_offsets,
                                                 target_segment,
                                                 selection_start,
                                                 selection_end);
 }
 
 PP_Bool IsIMEInputEvent(PP_Resource resource) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::IsIMEInputEvent()";
+  VLOG(4) << "PPB_IMEInputEvent::IsIMEInputEvent()";
   if (!IsInputEvent(resource))
     return PP_FALSE;  // Prevent warning log in GetType.
   PP_InputEvent_Type type = GetType(resource);
   return PP_FromBool(type == PP_INPUTEVENT_TYPE_IME_COMPOSITION_START ||
                      type == PP_INPUTEVENT_TYPE_IME_COMPOSITION_UPDATE ||
                      type == PP_INPUTEVENT_TYPE_IME_COMPOSITION_END ||
                      type == PP_INPUTEVENT_TYPE_IME_TEXT);
 }
 
 PP_Var GetIMEText(PP_Resource ime_event) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::GetText()";
+  VLOG(4) << "PPB_IMEInputEvent::GetText()";
   return GetCharacterText(ime_event);
 }
 
 uint32_t GetIMESegmentNumber(PP_Resource ime_event) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::GetSegmentNumber()";
+  VLOG(4) << "PPB_IMEInputEvent::GetSegmentCount()";
   EnterInputEvent enter(ime_event, true);
   if (enter.failed())
     return 0;
   return enter.object()->GetIMESegmentNumber();
 }
 
 uint32_t GetIMESegmentOffset(PP_Resource ime_event, uint32_t index) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::GetSegmentOffset()";
+  VLOG(4) << "PPB_IMEInputEvent::GetSegmentOffset()";
   EnterInputEvent enter(ime_event, true);
   if (enter.failed())
     return 0;
   return enter.object()->GetIMESegmentOffset(index);
 }
 
 int32_t GetIMETargetSegment(PP_Resource ime_event) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::GetTargetSegment()";
+  VLOG(4) << "PPB_IMEInputEvent::GetTargetSegment()";
   EnterInputEvent enter(ime_event, true);
   if (enter.failed())
     return -1;
   return enter.object()->GetIMETargetSegment();
 }
 
 void GetIMESelection(PP_Resource ime_event, uint32_t* start, uint32_t* end) {
-  VLOG(4) << "PPB_IMEInputEvent_Dev::GetSelection()";
+  VLOG(4) << "PPB_IMEInputEvent::GetSelection()";
   EnterInputEvent enter(ime_event, true);
   if (enter.failed()) {
     if (start)
       *start = 0;
     if (end)
       *end = 0;
     return;
   }
   enter.object()->GetIMESelection(start, end);
 }
 
-const PPB_IMEInputEvent_Dev_0_1 g_ppb_ime_input_event_0_1_thunk = {
+const PPB_IMEInputEvent_1_0 g_ppb_ime_input_event_1_0_thunk = {
+  &CreateIMEInputEvent,
   &IsIMEInputEvent,
   &GetIMEText,
   &GetIMESegmentNumber,
   &GetIMESegmentOffset,
   &GetIMETargetSegment,
   &GetIMESelection
 };
 
-const PPB_IMEInputEvent_Dev_0_2 g_ppb_ime_input_event_0_2_thunk = {
+// TODO(nona): Remove once Flash and PDF plugin support IMEInputEvent1.0.
+const PPB_IMEInputEvent_Dev_0_2 g_ppb_ime_input_event_dev_0_2_thunk = {
   &CreateIMEInputEvent,
   &IsIMEInputEvent,
   &GetIMEText,
   &GetIMESegmentNumber,
   &GetIMESegmentOffset,
   &GetIMETargetSegment,
   &GetIMESelection
 };
 
 // Touch -----------------------------------------------------------------------
@@ skipping 88 matching lines @@
 
 const PPB_KeyboardInputEvent_Dev_0_1*
     GetPPB_KeyboardInputEvent_Dev_0_1_Thunk() {
   return &g_ppb_keyboard_input_event_dev_thunk;
 }
 
 const PPB_WheelInputEvent_1_0* GetPPB_WheelInputEvent_1_0_Thunk() {
   return &g_ppb_wheel_input_event_thunk;
 }
 
-const PPB_IMEInputEvent_Dev_0_1* GetPPB_IMEInputEvent_Dev_0_1_Thunk() {
-  return &g_ppb_ime_input_event_0_1_thunk;
+const PPB_IMEInputEvent_1_0* GetPPB_IMEInputEvent_1_0_Thunk() {
+  return &g_ppb_ime_input_event_1_0_thunk;
 }
 
+// TODO(nona): Remove once Flash and PDF plugin support IMEInputEvent1.0.
 const PPB_IMEInputEvent_Dev_0_2* GetPPB_IMEInputEvent_Dev_0_2_Thunk() {
-  return &g_ppb_ime_input_event_0_2_thunk;
+  return &g_ppb_ime_input_event_dev_0_2_thunk;
 }
 
 const PPB_TouchInputEvent_1_0* GetPPB_TouchInputEvent_1_0_Thunk() {
   return &g_ppb_touch_input_event_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi