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

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

Issue 2352713004: Added displayId to Gamepad (Closed)
Patch Set: Re-upstream w/o webvr dependency Created 4 years, 3 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/gamepad/Gamepad.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/atomicops.h" 10 #include "base/atomicops.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 // Normalized values representing buttons, in the range [0..1]. 85 // Normalized values representing buttons, in the range [0..1].
86 WebKitGamepadButton buttons[kButtonsLengthCap]; 86 WebKitGamepadButton buttons[kButtonsLengthCap];
87 87
88 // Mapping type (for example "standard") 88 // Mapping type (for example "standard")
89 base::char16 mapping[kMappingLengthCap]; 89 base::char16 mapping[kMappingLengthCap];
90 90
91 WebKitGamepadPose pose; 91 WebKitGamepadPose pose;
92 92
93 WebKitGamepadHand hand; 93 WebKitGamepadHand hand;
94
95 // ID of the VRDisplay this gamepad is associated with, if any.
96 unsigned display_id;
94 }; 97 };
95 98
96 // This must match the definition of blink::Gamepads. The GamepadHost unit 99 // This must match the definition of blink::Gamepads. The GamepadHost unit
97 // test has some compile asserts to validate this. 100 // test has some compile asserts to validate this.
98 struct WebKitGamepads { 101 struct WebKitGamepads {
99 static const size_t kItemsLengthCap = 4; 102 static const size_t kItemsLengthCap = 4;
100 103
101 // Number of valid entries in the items array. 104 // Number of valid entries in the items array.
102 unsigned length; 105 unsigned length;
103 106
(...skipping 11 matching lines...) Expand all
115 118
116 #pragma pack(pop) 119 #pragma pack(pop)
117 120
118 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData( 121 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData(
119 const WebKitGamepads& webkit_data, 122 const WebKitGamepads& webkit_data,
120 PP_GamepadsSampleData* output_data); 123 PP_GamepadsSampleData* output_data);
121 124
122 } // namespace ppapi 125 } // namespace ppapi
123 126
124 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 127 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/gamepad/Gamepad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698