Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_input_event.cc

Issue 7715021: Add movement information to PPB_MouseInputEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d9e15d8b9e8214e42cd7cfb65ad63adb05750513..3a1e700fdb8d12e380a46c5dcbce3d5aaddb8af2 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,19 +130,22 @@ uint32_t GetModifiers(PP_Resource event) {
// 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(
@@ -155,12 +158,28 @@ PP_Resource CreateMouseInputEvent(PP_Instance instance,
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;
@@ -186,6 +205,10 @@ 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,
@@ -306,9 +329,9 @@ const PPB_InputEvent* PluginInputEvent::GetInterface() {
}
// 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,
@@ -318,6 +341,19 @@ const PPB_MouseInputEvent* PluginInputEvent::GetMouseInterface() {
}
// 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,
@@ -379,6 +415,10 @@ 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;
}

Powered by Google App Engine
This is Rietveld 408576698