| OLD | NEW |
| 1 // Copyright 2011 The Native Client Authors. All rights reserved. | 1 // Copyright 2011 The Native Client Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can | 2 // Use of this source code is governed by a BSD-style license that can |
| 3 // be found in the LICENSE file. | 3 // be found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ | 5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ |
| 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ | 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ |
| 7 | 7 |
| 8 #include "native_client/src/include/nacl_macros.h" | 8 #include "native_client/src/include/nacl_macros.h" |
| 9 #include "ppapi/c/pp_instance.h" | 9 #include "ppapi/c/pp_instance.h" |
| 10 #include "ppapi/c/pp_macros.h" | 10 #include "ppapi/c/pp_macros.h" |
| 11 #include "ppapi/c/pp_rect.h" | 11 #include "ppapi/c/pp_rect.h" |
| 12 #include "ppapi/c/ppb_input_event.h" | 12 #include "ppapi/c/ppb_input_event.h" |
| 13 | 13 |
| 14 namespace ppapi_proxy { | 14 namespace ppapi_proxy { |
| 15 | 15 |
| 16 // The data for a single input event. | 16 // The data for a single input event. |
| 17 struct InputEventData { | 17 struct InputEventData { |
| 18 InputEventData(); | 18 InputEventData(); |
| 19 ~InputEventData(); | 19 ~InputEventData(); |
| 20 | 20 |
| 21 PP_InputEvent_Type event_type; | 21 PP_InputEvent_Type event_type; |
| 22 uint32_t event_modifiers; | 22 uint32_t event_modifiers; |
| 23 PP_TimeTicks event_time_stamp; | 23 PP_TimeTicks event_time_stamp; |
| 24 | 24 |
| 25 PP_InputEvent_MouseButton mouse_button; | 25 PP_InputEvent_MouseButton mouse_button; |
| 26 int32_t mouse_click_count; | 26 int32_t mouse_click_count; |
| 27 PP_Point mouse_position; | 27 PP_Point mouse_position; |
| 28 PP_Point mouse_movement; |
| 28 | 29 |
| 29 PP_FloatPoint wheel_delta; | 30 PP_FloatPoint wheel_delta; |
| 30 PP_FloatPoint wheel_ticks; | 31 PP_FloatPoint wheel_ticks; |
| 31 PP_Bool wheel_scroll_by_page; | 32 PP_Bool wheel_scroll_by_page; |
| 32 | 33 |
| 33 uint32_t key_code; | 34 uint32_t key_code; |
| 34 }; | 35 }; |
| 35 // Make sure that the size is consistent across platforms, so the alignment is | 36 // Make sure that the size is consistent across platforms, so the alignment is |
| 36 // consistent. Note the fields above are carefully ordered to make sure it is | 37 // consistent. Note the fields above are carefully ordered to make sure it is |
| 37 // consistent. New fields may require some adjustment to keep a consistent size | 38 // consistent. New fields may require some adjustment to keep a consistent size |
| 38 // and alignment. TODO(dmichael): This is only required because we don't pickle | 39 // and alignment. TODO(dmichael): This is only required because we don't pickle |
| 39 // the type. As a short-cut, we memcpy it instead. It would be cleaner to | 40 // the type. As a short-cut, we memcpy it instead. It would be cleaner to |
| 40 // pickle this struct. | 41 // pickle this struct. |
| 41 PP_COMPILE_ASSERT_SIZE_IN_BYTES(InputEventData, 56); | 42 PP_COMPILE_ASSERT_SIZE_IN_BYTES(InputEventData, 64); |
| 42 | 43 |
| 43 } // namespace ppapi_proxy | 44 } // namespace ppapi_proxy |
| 44 | 45 |
| 45 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ | 46 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ |
| OLD | NEW |