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

Side by Side Diff: ppapi/shared_impl/ppb_gamepad_shared.h

Issue 165983005: Updating Gamepad API to match latest spec (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ifdef-gaurds Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 5 #ifndef PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
6 #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 6 #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
7 7
8 #include "base/atomicops.h" 8 #include "base/atomicops.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "ppapi/c/ppb_gamepad.h" 10 #include "ppapi/c/ppb_gamepad.h"
11 #include "ppapi/shared_impl/ppapi_shared_export.h" 11 #include "ppapi/shared_impl/ppapi_shared_export.h"
12 12
13 namespace ppapi { 13 namespace ppapi {
14 14
15 // TODO(brettw) when we remove the non-IPC-based gamepad implementation, this 15 // TODO(brettw) when we remove the non-IPC-based gamepad implementation, this
16 // code should all move into the GamepadResource. 16 // code should all move into the GamepadResource.
17 17
18 #pragma pack(push, 1) 18 #pragma pack(push, 1)
19 19
20 // This must match the definition of blink::Gamepad. The GamepadHost unit test 20 // This must match the definition of blink::Gamepad. The GamepadHost unit test
21 // has some compile asserts to validate this. 21 // has some compile asserts to validate this.
22 struct WebKitGamepad { 22 struct WebKitGamepad {
23 static const size_t kIdLengthCap = 128; 23 static const size_t kIdLengthCap = 128;
24 static const size_t kMappingLengthCap = 16;
24 static const size_t kAxesLengthCap = 16; 25 static const size_t kAxesLengthCap = 16;
25 static const size_t kButtonsLengthCap = 32; 26 static const size_t kButtonsLengthCap = 32;
26 27
27 // Is there a gamepad connected at this index? 28 // Is there a gamepad connected at this index?
28 bool connected; 29 bool connected;
29 30
30 // Device identifier (based on manufacturer, model, etc.). 31 // Device identifier (based on manufacturer, model, etc.).
31 base::char16 id[kIdLengthCap]; 32 base::char16 id[kIdLengthCap];
32 33
34 #ifdef ENABLE_NEW_GAMEPAD_API
35 // Mapping type (for example "standard")
36 base::char16 mapping[kMappingLengthCap];
37 #endif
38
33 // Monotonically increasing value referring to when the data were last 39 // Monotonically increasing value referring to when the data were last
34 // updated. 40 // updated.
35 unsigned long long timestamp; 41 unsigned long long timestamp;
36 42
37 // Number of valid entries in the axes array. 43 // Number of valid entries in the axes array.
38 unsigned axes_length; 44 unsigned axes_length;
39 45
40 // Normalized values representing axes, in the range [-1..1]. 46 // Normalized values representing axes, in the range [-1..1].
41 float axes[kAxesLengthCap]; 47 float axes[kAxesLengthCap];
42 48
(...skipping 26 matching lines...) Expand all
69 75
70 #pragma pack(pop) 76 #pragma pack(pop)
71 77
72 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData( 78 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData(
73 const WebKitGamepads& webkit_data, 79 const WebKitGamepads& webkit_data,
74 PP_GamepadsSampleData* output_data); 80 PP_GamepadsSampleData* output_data);
75 81
76 } // namespace ppapi 82 } // namespace ppapi
77 83
78 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 84 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698