diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 06:44:51 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 06:44:51 +0000 |
| commit | 957c93abd8af4170e5da2d5d0f0862e46cb8491e (patch) | |
| tree | 49a5c7b114c65c8531041c008f6f9c77c3fd7c8e /ppapi/proxy | |
| parent | 78b0b3703719ceba85cf99d8e5f27424c57e796c (diff) | |
| download | chromium_src-957c93abd8af4170e5da2d5d0f0862e46cb8491e.zip chromium_src-957c93abd8af4170e5da2d5d0f0862e46cb8491e.tar.gz chromium_src-957c93abd8af4170e5da2d5d0f0862e46cb8491e.tar.bz2 | |
Revise gamepad interface
Per API review, revision to gamepad interface. Still in _dev for now, will move to stable as separate change once we're happy with the interface.
Change summary:
- renames of various fields, and main function in idl per discussion
- timestamp to double, connected to PP_Bool
- remove #pragma pack in header, now copied member-by-member
- update examples
One complication was in removing the #pragma pack. Copying by member in webkit/plugins/ppapi/ppapi_plugin_instance.cc avoids the need to keep webkit and pepper in sync and exactly the same layout (a good thing).
However, when the native_client ppapi proxy is going between 32 and 64 the data structure ends up being a different size due to padding (all the fields are teh same sizes though). To workaround this, I added padding fields, and assert_sizes to confirm the sizes are the same on both "sides". This is similar to how PP_Point, input events, etc. get rpc'd, but perhaps there's a better way.
BUG=112879
Review URL: http://codereview.chromium.org/9405033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 2 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 1f71e87..8842783 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -288,7 +288,7 @@ PP_Bool PPB_Instance_Proxy::FlashGetScreenSize(PP_Instance instance, } void PPB_Instance_Proxy::SampleGamepads(PP_Instance instance, - PP_GamepadsData_Dev* data) { + PP_GamepadsSampleData_Dev* data) { NOTIMPLEMENTED(); } diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index 80927a3..60661f7 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -72,8 +72,8 @@ class PPB_Instance_Proxy : public InterfaceProxy, PP_Bool fullscreen) OVERRIDE; virtual PP_Bool FlashGetScreenSize(PP_Instance instance, PP_Size* size) OVERRIDE; - virtual void SampleGamepads(PP_Instance instance, PP_GamepadsData_Dev* data) - OVERRIDE; + virtual void SampleGamepads(PP_Instance instance, + PP_GamepadsSampleData_Dev* data) OVERRIDE; virtual int32_t RequestInputEvents(PP_Instance instance, uint32_t event_classes) OVERRIDE; virtual int32_t RequestFilteringInputEvents(PP_Instance instance, |