3 files changed, 46 insertions, 4 deletions
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc
index 5de70c0..db01aa7 100644
--- a/ppapi/proxy/dispatcher.cc
+++ b/ppapi/proxy/dispatcher.cc
@@ -132,13 +132,16 @@ InterfaceList::InterfaceList() {
   AddPPB(PPB_Flash_Clipboard_Proxy::GetInfo());
   AddPPB(PPB_Flash_File_FileRef_Proxy::GetInfo());
   AddPPB(PPB_Flash_File_ModuleLocal_Proxy::GetInfo());
-  AddPPB(PPB_Flash_Proxy::GetInfo());
   AddPPB(PPB_Flash_Menu_Proxy::GetInfo());
+  AddPPB(PPB_Flash_Proxy::GetInfo());
   AddPPB(PPB_Flash_TCPSocket_Proxy::GetInfo());
   AddPPB(PPB_Font_Proxy::GetInfo());
   AddPPB(PPB_Graphics2D_Proxy::GetInfo());
   AddPPB(PPB_ImageData_Proxy::GetInfo());
-  AddPPB(PPB_InputEvent_Proxy::GetInfo());
+  AddPPB(PPB_InputEvent_Proxy::GetInputEventInfo());
+  AddPPB(PPB_InputEvent_Proxy::GetKeyboardInputEventInfo());
+  AddPPB(PPB_InputEvent_Proxy::GetMouseInputEventInfo());
+  AddPPB(PPB_InputEvent_Proxy::GetWheelInputEventInfo());
   AddPPB(PPB_Instance_Proxy::GetInfo0_5());
   AddPPB(PPB_Instance_Proxy::GetInfo1_0());
   AddPPB(PPB_Instance_Proxy::GetInfoFullscreen());
diff --git a/ppapi/proxy/ppb_input_event_proxy.cc b/ppapi/proxy/ppb_input_event_proxy.cc
index d5c6f4b..383cf1a 100644
--- a/ppapi/proxy/ppb_input_event_proxy.cc
+++ b/ppapi/proxy/ppb_input_event_proxy.cc
@@ -72,7 +72,7 @@ PPB_InputEvent_Proxy::~PPB_InputEvent_Proxy() {
 }
 
 // static
-const InterfaceProxy::Info* PPB_InputEvent_Proxy::GetInfo() {
+const InterfaceProxy::Info* PPB_InputEvent_Proxy::GetInputEventInfo() {
   static const Info info = {
     ::ppapi::thunk::GetPPB_InputEvent_Thunk(),
     PPB_INPUT_EVENT_INTERFACE,
@@ -84,6 +84,42 @@ const InterfaceProxy::Info* PPB_InputEvent_Proxy::GetInfo() {
 }
 
 // static
+const InterfaceProxy::Info* PPB_InputEvent_Proxy::GetKeyboardInputEventInfo() {
+  static const Info info = {
+    ::ppapi::thunk::GetPPB_KeyboardInputEvent_Thunk(),
+    PPB_KEYBOARD_INPUT_EVENT_INTERFACE,
+    INTERFACE_ID_NONE,
+    false,
+    &CreateInputEventProxy,
+  };
+  return &info;
+}
+
+// static
+const InterfaceProxy::Info* PPB_InputEvent_Proxy::GetMouseInputEventInfo() {
+  static const Info info = {
+    ::ppapi::thunk::GetPPB_MouseInputEvent_Thunk(),
+    PPB_MOUSE_INPUT_EVENT_INTERFACE,
+    INTERFACE_ID_NONE,
+    false,
+    &CreateInputEventProxy,
+  };
+  return &info;
+}
+
+// static
+const InterfaceProxy::Info* PPB_InputEvent_Proxy::GetWheelInputEventInfo() {
+  static const Info info = {
+    ::ppapi::thunk::GetPPB_WheelInputEvent_Thunk(),
+    PPB_WHEEL_INPUT_EVENT_INTERFACE,
+    INTERFACE_ID_NONE,
+    false,
+    &CreateInputEventProxy,
+  };
+  return &info;
+}
+
+// static
 PP_Resource PPB_InputEvent_Proxy::CreateProxyResource(
     PP_Instance instance,
     const InputEventData& data) {
diff --git a/ppapi/proxy/ppb_input_event_proxy.h b/ppapi/proxy/ppb_input_event_proxy.h
index bd80535..fb0fedd 100644
--- a/ppapi/proxy/ppb_input_event_proxy.h
+++ b/ppapi/proxy/ppb_input_event_proxy.h
@@ -22,7 +22,10 @@ class PPB_InputEvent_Proxy : public InterfaceProxy {
   PPB_InputEvent_Proxy(Dispatcher* dispatcher, const void* target_interface);
   virtual ~PPB_InputEvent_Proxy();
 
-  static const Info* GetInfo();
+  static const Info* GetInputEventInfo();
+  static const Info* GetKeyboardInputEventInfo();
+  static const Info* GetMouseInputEventInfo();
+  static const Info* GetWheelInputEventInfo();
 
   static PP_Resource CreateProxyResource(PP_Instance instance,
                                          const ppapi::InputEventData& data);