Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium 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" |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 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 PP_Point mouse_movement; |
| 29 | 29 |
| 30 PP_FloatPoint wheel_delta; | 30 PP_FloatPoint wheel_delta; |
| 31 PP_FloatPoint wheel_ticks; | 31 PP_FloatPoint wheel_ticks; |
| 32 PP_Bool wheel_scroll_by_page; | 32 PP_Bool wheel_scroll_by_page; |
| 33 | 33 |
| 34 uint32_t key_code; | 34 uint32_t key_code; |
| 35 uint32_t usb_scan_code; | |
| 35 }; | 36 }; |
| 36 // Make sure that the size is consistent across platforms, so the alignment is | 37 // Make sure that the size is consistent across platforms, so the alignment is |
| 37 // consistent. Note the fields above are carefully ordered to make sure it is | 38 // consistent. Note the fields above are carefully ordered to make sure it is |
| 38 // consistent. New fields may require some adjustment to keep a consistent size | 39 // consistent. New fields may require some adjustment to keep a consistent size |
| 39 // and alignment. TODO(dmichael): This is only required because we don't pickle | 40 // and alignment. TODO(dmichael): This is only required because we don't pickle |
| 40 // the type. As a short-cut, we memcpy it instead. It would be cleaner to | 41 // the type. As a short-cut, we memcpy it instead. It would be cleaner to |
| 41 // pickle this struct. | 42 // pickle this struct. |
| 42 PP_COMPILE_ASSERT_SIZE_IN_BYTES(InputEventData, 64); | 43 PP_COMPILE_ASSERT_SIZE_IN_BYTES(InputEventData, 72); |
|
garykac
2012/02/09 14:26:04
I naively expected this to be 68.
| |
| 43 | 44 |
| 44 } // namespace ppapi_proxy | 45 } // namespace ppapi_proxy |
| 45 | 46 |
| 46 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ | 47 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_INPUT_EVENT_DATA_H_ |
| OLD | NEW |