Move PPB_KeyboardInputEvent.GetCode to stable.

Remove GetUsbKeycode and SetUsbKeyCode since they were earlier verisons of this API that are not being used anywhere.

Remove all the KeyboardEvent _Dev files since they will no longer be used once GetCode is moved out.

BUG=286359,284774,275049
R=binji@chromium.org, dcheng@chromium.org, dmichael@chromium.org

Review URL: https://codereview.chromium.org/112983005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247275 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 55 insertions, 50 deletions

diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index a3bbc49..b0f5911 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -18,8 +18,6 @@ PROXIED_IFACE(PPB_FILECHOOSER_DEV_INTERFACE_0_5, PPB_FileChooser_Dev_0_5)
 PROXIED_IFACE(PPB_FILECHOOSER_DEV_INTERFACE_0_6, PPB_FileChooser_Dev_0_6)
 UNPROXIED_IFACE(PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3)
 PROXIED_IFACE(PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2, PPB_IMEInputEvent_Dev_0_2)
-PROXIED_IFACE(PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_2,
-              PPB_KeyboardInputEvent_Dev_0_2)
 PROXIED_IFACE(PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1)
 PROXIED_IFACE(PPB_PRINTING_DEV_INTERFACE_0_7, PPB_Printing_Dev_0_7)
 PROXIED_IFACE(PPB_TEXTINPUT_DEV_INTERFACE_0_2, PPB_TextInput_Dev_0_2)
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index ddbe913..afbf19b 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -62,6 +62,8 @@ PROXIED_IFACE(PPB_IME_INPUT_EVENT_INTERFACE_1_0, PPB_IMEInputEvent_1_0)
 PROXIED_IFACE(PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0)
 PROXIED_IFACE(PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0,
               PPB_KeyboardInputEvent_1_0)
+PROXIED_IFACE(PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_2,
+              PPB_KeyboardInputEvent_1_2)
 PROXIED_IFACE(PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0, PPB_MouseInputEvent_1_0)
 PROXIED_IFACE(PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1, PPB_MouseInputEvent_1_1)
 PROXIED_IFACE(PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0, PPB_WheelInputEvent_1_0)
diff --git a/ppapi/thunk/ppb_input_event_api.h b/ppapi/thunk/ppb_input_event_api.h
index e2eb357..00627353 100644
--- a/ppapi/thunk/ppb_input_event_api.h
+++ b/ppapi/thunk/ppb_input_event_api.h
@@ -6,7 +6,6 @@
 #define PPAPI_THUNK_PPB_INPUT_EVENT_API_H_
 
 #include "ppapi/c/dev/ppb_ime_input_event_dev.h"
-#include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
@@ -36,8 +35,6 @@ class PPAPI_THUNK_EXPORT PPB_InputEvent_API {
   virtual PP_Bool GetWheelScrollByPage() = 0;
   virtual uint32_t GetKeyCode() = 0;
   virtual PP_Var GetCharacterText() = 0;
-  virtual PP_Bool SetUsbKeyCode(uint32_t) = 0;
-  virtual uint32_t GetUsbKeyCode() = 0;
   virtual PP_Var GetCode() = 0;
   virtual uint32_t GetIMESegmentNumber() = 0;
   virtual uint32_t GetIMESegmentOffset(uint32_t index) = 0;
diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc
index 5a0927d..c29b56c 100644
--- a/ppapi/thunk/ppb_input_event_thunk.cc
+++ b/ppapi/thunk/ppb_input_event_thunk.cc
@@ -244,19 +244,37 @@ const PPB_WheelInputEvent g_ppb_wheel_input_event_thunk = {
 
 // Keyboard --------------------------------------------------------------------
 
-PP_Resource CreateKeyboardInputEvent(PP_Instance instance,
-                                     PP_InputEvent_Type type,
-                                     PP_TimeTicks time_stamp,
-                                     uint32_t modifiers,
-                                     uint32_t key_code,
-                                     struct PP_Var character_text) {
+PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance,
+                                         PP_InputEvent_Type type,
+                                         PP_TimeTicks time_stamp,
+                                         uint32_t modifiers,
+                                         uint32_t key_code,
+                                         struct PP_Var character_text) {
   VLOG(4) << "PPB_KeyboardInputEvent::Create()";
   EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
-  return enter.functions()->CreateKeyboardInputEvent(instance, type, time_stamp,
-                                                     modifiers, key_code,
-                                                     character_text);
+  return enter.functions()->CreateKeyboardInputEvent_1_0(instance, type,
+                                                         time_stamp,
+                                                         modifiers, key_code,
+                                                         character_text);
+}
+
+PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance,
+                                         PP_InputEvent_Type type,
+                                         PP_TimeTicks time_stamp,
+                                         uint32_t modifiers,
+                                         uint32_t key_code,
+                                         struct PP_Var character_text,
+                                         struct PP_Var code) {
+  VLOG(4) << "PPB_KeyboardInputEvent::Create()";
+  EnterResourceCreation enter(instance);
+  if (enter.failed())
+    return 0;
+  return enter.functions()->CreateKeyboardInputEvent_1_2(instance, type,
+                                                         time_stamp,
+                                                         modifiers, key_code,
+                                                         character_text, code);
 }
 
 PP_Bool IsKeyboardInputEvent(PP_Resource resource) {
@@ -286,44 +304,27 @@ PP_Var GetCharacterText(PP_Resource character_event) {
   return enter.object()->GetCharacterText();
 }
 
-const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = {
-  &CreateKeyboardInputEvent,
-  &IsKeyboardInputEvent,
-  &GetKeyCode,
-  &GetCharacterText
-};
-
-// _Dev interface.
-
-PP_Bool SetUsbKeyCode(PP_Resource key_event, uint32_t usb_key_code) {
-  VLOG(4) << "PPB_KeyboardInputEvent_Dev::SetUsbKeyCode()";
-  EnterInputEvent enter(key_event, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->SetUsbKeyCode(usb_key_code);
-}
-
-uint32_t GetUsbKeyCode(PP_Resource key_event) {
-  VLOG(4) << "PPB_KeyboardInputEvent_Dev::GetUsbKeyCode()";
-  EnterInputEvent enter(key_event, true);
-  if (enter.failed())
-    return 0;
-  return enter.object()->GetUsbKeyCode();
-}
-
 PP_Var GetCode(PP_Resource key_event) {
-  VLOG(4) << "PPB_KeyboardInputEvent_Dev::GetCode()";
+  VLOG(4) << "PPB_KeyboardInputEvent::GetCode()";
   EnterInputEvent enter(key_event, true);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.object()->GetCode();
 }
 
-const PPB_KeyboardInputEvent_Dev_0_2
-    g_ppb_keyboard_input_event_dev_0_2_thunk = {
-  &SetUsbKeyCode,
-  &GetUsbKeyCode,
-  &GetCode,
+const PPB_KeyboardInputEvent_1_0 g_ppb_keyboard_input_event_1_0_thunk = {
+  &CreateKeyboardInputEvent_1_0,
+  &IsKeyboardInputEvent,
+  &GetKeyCode,
+  &GetCharacterText
+};
+
+const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = {
+  &CreateKeyboardInputEvent_1_2,
+  &IsKeyboardInputEvent,
+  &GetKeyCode,
+  &GetCharacterText,
+  &GetCode
 };
 
 // Composition -----------------------------------------------------------------
@@ -518,12 +519,11 @@ const PPB_MouseInputEvent_1_1* GetPPB_MouseInputEvent_1_1_Thunk() {
 }
 
 const PPB_KeyboardInputEvent_1_0* GetPPB_KeyboardInputEvent_1_0_Thunk() {
-  return &g_ppb_keyboard_input_event_thunk;
+  return &g_ppb_keyboard_input_event_1_0_thunk;
 }
 
-const PPB_KeyboardInputEvent_Dev_0_2*
-    GetPPB_KeyboardInputEvent_Dev_0_2_Thunk() {
-  return &g_ppb_keyboard_input_event_dev_0_2_thunk;
+const PPB_KeyboardInputEvent_1_2* GetPPB_KeyboardInputEvent_1_2_Thunk() {
+  return &g_ppb_keyboard_input_event_thunk;
 }
 
 const PPB_WheelInputEvent_1_0* GetPPB_WheelInputEvent_1_0_Thunk() {
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index bff4f15..0c3dd42 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -63,13 +63,21 @@ class ResourceCreationAPI {
                                           int32_t target_segment,
                                           uint32_t selection_start,
                                           uint32_t selection_end) = 0;
-  virtual PP_Resource CreateKeyboardInputEvent(
+  virtual PP_Resource CreateKeyboardInputEvent_1_0(
       PP_Instance instance,
       PP_InputEvent_Type type,
       PP_TimeTicks time_stamp,
       uint32_t modifiers,
       uint32_t key_code,
       struct PP_Var character_text) = 0;
+  virtual PP_Resource CreateKeyboardInputEvent_1_2(
+      PP_Instance instance,
+      PP_InputEvent_Type type,
+      PP_TimeTicks time_stamp,
+      uint32_t modifiers,
+      uint32_t key_code,
+      struct PP_Var character_text,
+      struct PP_Var code) = 0;
   virtual PP_Resource CreateMouseInputEvent(
       PP_Instance instance,
       PP_InputEvent_Type type,