| Index: ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc
|
| index 3a1e700fdb8d12e380a46c5dcbce3d5aaddb8af2..ac0f136fdaafd8e8ea8720e0ed36dc40be8439c0 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc
|
| @@ -130,7 +130,7 @@ uint32_t GetModifiers(PP_Resource event) {
|
|
|
| // Mouse -----------------------------------------------------------------------
|
|
|
| -PP_Resource CreateMouseInputEvent1_1(PP_Instance instance,
|
| +PP_Resource CreateMouseInputEventDev(PP_Instance instance,
|
| PP_InputEvent_Type type,
|
| PP_TimeTicks time_stamp,
|
| uint32_t modifiers,
|
| @@ -166,15 +166,15 @@ PP_Resource CreateMouseInputEvent1_1(PP_Instance instance,
|
| return kInvalidResourceId;
|
| }
|
|
|
| -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) {
|
| PP_Point mouse_movement = PP_MakePoint(0, 0);
|
| - return CreateMouseInputEvent1_1(instance, type, time_stamp, modifiers,
|
| + return CreateMouseInputEventDev(instance, type, time_stamp, modifiers,
|
| mouse_button, mouse_position, click_count,
|
| &mouse_movement);
|
|
|
| @@ -329,9 +329,9 @@ const PPB_InputEvent* PluginInputEvent::GetInterface() {
|
| }
|
|
|
| // static
|
| -const PPB_MouseInputEvent_1_0* PluginInputEvent::GetMouseInterface1_0() {
|
| - static const PPB_MouseInputEvent_1_0 mouse_input_event_interface = {
|
| - CreateMouseInputEvent1_0,
|
| +const PPB_MouseInputEvent* PluginInputEvent::GetMouseInterface() {
|
| + static const PPB_MouseInputEvent mouse_input_event_interface = {
|
| + CreateMouseInputEvent,
|
| IsMouseInputEvent,
|
| ::GetMouseButton,
|
| ::GetMousePosition,
|
| @@ -341,9 +341,9 @@ const PPB_MouseInputEvent_1_0* PluginInputEvent::GetMouseInterface1_0() {
|
| }
|
|
|
| // static
|
| -const PPB_MouseInputEvent* PluginInputEvent::GetMouseInterface1_1() {
|
| - static const PPB_MouseInputEvent mouse_input_event_interface = {
|
| - CreateMouseInputEvent1_1,
|
| +const PPB_MouseInputEvent_Dev* PluginInputEvent::GetMouseDevInterface() {
|
| + static const PPB_MouseInputEvent_Dev mouse_input_event_interface = {
|
| + CreateMouseInputEventDev,
|
| IsMouseInputEvent,
|
| ::GetMouseButton,
|
| ::GetMousePosition,
|
|
|