| Index: ppapi/thunk/ppb_input_event_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc
|
| index bd28495a90ac3926605c3a600cc4e04fe464558e..058b125f0e96deebab0b11db8fe11180c80b34a3 100644
|
| --- a/ppapi/thunk/ppb_input_event_thunk.cc
|
| +++ b/ppapi/thunk/ppb_input_event_thunk.cc
|
| @@ -80,13 +80,13 @@ const PPB_InputEvent g_ppb_input_event_thunk = {
|
|
|
| // Mouse -----------------------------------------------------------------------
|
|
|
| -PP_Resource CreateMouseInputEvent1_0(PP_Instance instance,
|
| - PP_InputEvent_Type type,
|
| - PP_TimeTicks time_stamp,
|
| - uint32_t modifiers,
|
| - PP_InputEvent_MouseButton mouse_button,
|
| - const PP_Point* mouse_position,
|
| - int32_t click_count) {
|
| +PP_Resource CreateMouseInputEvent(PP_Instance instance,
|
| + PP_InputEvent_Type type,
|
| + PP_TimeTicks time_stamp,
|
| + uint32_t modifiers,
|
| + PP_InputEvent_MouseButton mouse_button,
|
| + const PP_Point* mouse_position,
|
| + int32_t click_count) {
|
| EnterFunction<ResourceCreationAPI> enter(instance, true);
|
| if (enter.failed())
|
| return 0;
|
| @@ -98,7 +98,7 @@ PP_Resource CreateMouseInputEvent1_0(PP_Instance instance,
|
| &mouse_movement);
|
| }
|
|
|
| -PP_Resource CreateMouseInputEvent1_1(PP_Instance instance,
|
| +PP_Resource CreateMouseInputEventDev(PP_Instance instance,
|
| PP_InputEvent_Type type,
|
| PP_TimeTicks time_stamp,
|
| uint32_t modifiers,
|
| @@ -155,16 +155,16 @@ PP_Point GetMouseMovement(PP_Resource mouse_event) {
|
| return enter.object()->GetMouseMovement();
|
| }
|
|
|
| -const PPB_MouseInputEvent_1_0 g_ppb_mouse_input_event_1_0_thunk = {
|
| - &CreateMouseInputEvent1_0,
|
| +const PPB_MouseInputEvent g_ppb_mouse_input_event_thunk = {
|
| + &CreateMouseInputEvent,
|
| &IsMouseInputEvent,
|
| &GetMouseButton,
|
| &GetMousePosition,
|
| &GetMouseClickCount
|
| };
|
|
|
| -const PPB_MouseInputEvent g_ppb_mouse_input_event_1_1_thunk = {
|
| - &CreateMouseInputEvent1_1,
|
| +const PPB_MouseInputEvent_Dev g_ppb_mouse_input_event_dev_thunk = {
|
| + &CreateMouseInputEventDev,
|
| &IsMouseInputEvent,
|
| &GetMouseButton,
|
| &GetMousePosition,
|
| @@ -277,12 +277,12 @@ const PPB_InputEvent* GetPPB_InputEvent_Thunk() {
|
| return &g_ppb_input_event_thunk;
|
| }
|
|
|
| -const PPB_MouseInputEvent_1_0* GetPPB_MouseInputEvent_1_0_Thunk() {
|
| - return &g_ppb_mouse_input_event_1_0_thunk;
|
| +const PPB_MouseInputEvent* GetPPB_MouseInputEvent_Thunk() {
|
| + return &g_ppb_mouse_input_event_thunk;
|
| }
|
|
|
| -const PPB_MouseInputEvent* GetPPB_MouseInputEvent_1_1_Thunk() {
|
| - return &g_ppb_mouse_input_event_1_1_thunk;
|
| +const PPB_MouseInputEvent_Dev* GetPPB_MouseInputEvent_Dev_Thunk() {
|
| + return &g_ppb_mouse_input_event_dev_thunk;
|
| }
|
|
|
| const PPB_KeyboardInputEvent* GetPPB_KeyboardInputEvent_Thunk() {
|
|
|