Add movement information to PPB_MouseInputEvent.

ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc

 // Copyright (c) 2011 The Native Client 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 "native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "native_client/src/include/nacl_scoped_ptr.h"
@@ skipping 112 matching lines @@
 PP_TimeTicks GetTimeStamp(PP_Resource event) {
   IMPLEMENT_RESOURCE_THUNK(GetTimeStamp, event, 0.0);
 }
 
 uint32_t GetModifiers(PP_Resource event) {
   IMPLEMENT_RESOURCE_THUNK(GetModifiers, event, 0);
 }
 
 // Mouse -----------------------------------------------------------------------
 
-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_Resource CreateMouseInputEvent1_1(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,
+                                     const PP_Point* mouse_movement) {
   DebugPrintf("PPB_InputEvent::CreateMouseInputEvent: instance="
               "%"NACL_PRIu32", type=%d, time_stamp=%lf, modifiers="
               "%"NACL_PRIu32", mouse_button=%d, x=%"NACL_PRId32", y="
-              "%"NACL_PRId32", click_count=%d\n",
+              "%"NACL_PRId32", click_count=%d, movement_x="
+              "%"NACL_PRId32", movement_y=%"NACL_PRId32"\n",
               instance, type, time_stamp, modifiers, mouse_button,
-              mouse_position->x, mouse_position->y, click_count);
+              mouse_position->x, mouse_position->y, click_count,
+              mouse_movement->x, mouse_movement->y);
   PP_Resource resource_id = kInvalidResourceId;
   NaClSrpcError srpc_result =
       PpbInputEventRpcClient::PPB_InputEvent_CreateMouseInputEvent(
           GetMainSrpcChannel(),
           instance,
           static_cast<int32_t>(type),
           time_stamp,
           static_cast<int32_t>(modifiers),
           static_cast<int32_t>(mouse_button),
           mouse_position->x,
           mouse_position->y,
           click_count,
+          mouse_movement->x,
+          mouse_movement->y,
           &resource_id);
   if (srpc_result == NACL_SRPC_RESULT_OK)
     return resource_id;
   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_Point mouse_movement = PP_MakePoint(0, 0);
+  return CreateMouseInputEvent1_1(instance, type, time_stamp, modifiers,
+                                  mouse_button, mouse_position, click_count,
+                                  &mouse_movement);
+
+}
+
 PP_Bool IsMouseInputEvent(PP_Resource resource) {
   if (!IsInputEvent(resource))
     return PP_FALSE;
   PP_InputEvent_Type type = GetType(resource);
   return PP_FromBool(type == PP_INPUTEVENT_TYPE_MOUSEDOWN ||
                      type == PP_INPUTEVENT_TYPE_MOUSEUP ||
                      type == PP_INPUTEVENT_TYPE_MOUSEMOVE ||
                      type == PP_INPUTEVENT_TYPE_MOUSEENTER ||
                      type == PP_INPUTEVENT_TYPE_MOUSELEAVE ||
                      type == PP_INPUTEVENT_TYPE_CONTEXTMENU);
 }
 
 PP_InputEvent_MouseButton GetMouseButton(PP_Resource mouse_event) {
   IMPLEMENT_RESOURCE_THUNK(GetMouseButton, mouse_event,
                            PP_INPUTEVENT_MOUSEBUTTON_NONE);
 }
 
 PP_Point GetMousePosition(PP_Resource mouse_event) {
   IMPLEMENT_RESOURCE_THUNK(GetMousePosition, mouse_event, PP_MakePoint(0, 0));
 }
 
 int32_t GetMouseClickCount(PP_Resource mouse_event) {
   IMPLEMENT_RESOURCE_THUNK(GetMouseClickCount, mouse_event, 0);
 }
 
+PP_Point GetMouseMovement(PP_Resource mouse_event) {
+  IMPLEMENT_RESOURCE_THUNK(GetMouseMovement, mouse_event, PP_MakePoint(0, 0));
+}
+
 // Wheel -----------------------------------------------------------------------
 
 PP_Resource CreateWheelInputEvent(PP_Instance instance,
                                   PP_TimeTicks time_stamp,
                                   uint32_t modifiers,
                                   const PP_FloatPoint* wheel_delta,
                                   const PP_FloatPoint* wheel_ticks,
                                   PP_Bool scroll_by_page) {
   DebugPrintf("PPB_InputEvent::CreateWheelInputEvent: instance="
               "%"NACL_PRIu32", time_stamp=%lf, modifiers="
@@ skipping 100 matching lines @@
     ClearInputEventRequest,
     IsInputEvent,
     ::GetType,
     ::GetTimeStamp,
     ::GetModifiers
   };
   return &input_event_interface;
 }
 
 // static
-const PPB_MouseInputEvent* PluginInputEvent::GetMouseInterface() {
-  static const PPB_MouseInputEvent mouse_input_event_interface = {
-    CreateMouseInputEvent,
+const PPB_MouseInputEvent_1_0* PluginInputEvent::GetMouseInterface1_0() {
+  static const PPB_MouseInputEvent_1_0 mouse_input_event_interface = {
+    CreateMouseInputEvent1_0,
     IsMouseInputEvent,
     ::GetMouseButton,
     ::GetMousePosition,
     ::GetMouseClickCount
   };
   return &mouse_input_event_interface;
 }
 
 // static
+const PPB_MouseInputEvent* PluginInputEvent::GetMouseInterface1_1() {
+  static const PPB_MouseInputEvent mouse_input_event_interface = {
+    CreateMouseInputEvent1_1,
+    IsMouseInputEvent,
+    ::GetMouseButton,
+    ::GetMousePosition,
+    ::GetMouseClickCount,
+    ::GetMouseMovement
+  };
+  return &mouse_input_event_interface;
+}
+
+// static
 const PPB_WheelInputEvent* PluginInputEvent::GetWheelInterface() {
   static const PPB_WheelInputEvent wheel_input_event_interface = {
     CreateWheelInputEvent,
     IsWheelInputEvent,
     ::GetWheelDelta,
     ::GetWheelTicks,
     ::GetWheelScrollByPage
   };
   return &wheel_input_event_interface;
 }
@@ skipping 41 matching lines @@
 }
 
 PP_Point PluginInputEvent::GetMousePosition() const {
   return input_event_data_.mouse_position;
 }
 
 int32_t PluginInputEvent::GetMouseClickCount() const {
   return input_event_data_.mouse_click_count;
 }
 
+PP_Point PluginInputEvent::GetMouseMovement() const {
+  return input_event_data_.mouse_movement;
+}
+
 PP_FloatPoint PluginInputEvent::GetWheelDelta() const {
   return input_event_data_.wheel_delta;
 }
 
 PP_FloatPoint PluginInputEvent::GetWheelTicks() const {
   return input_event_data_.wheel_ticks;
 }
 
 PP_Bool PluginInputEvent::GetWheelScrollByPage() const {
   return input_event_data_.wheel_scroll_by_page;
 }
 
 uint32_t PluginInputEvent::GetKeyCode() const {
   return input_event_data_.key_code;
 }
 
 PP_Var PluginInputEvent::GetCharacterText() const {
   PPBVarInterface()->AddRef(character_text_);
   return character_text_;
 }
 
 }  // namespace ppapi_proxy