Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "ppapi/shared_impl/ppb_gamepad_shared.h" | 5 #include "ppapi/shared_impl/ppb_gamepad_shared.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 | 8 |
| 9 namespace ppapi { | 9 namespace ppapi { |
| 10 | 10 |
| 11 void ConvertWebKitGamepadData(const WebKitGamepads& webkit_data, | 11 void ConvertWebKitGamepadData(const WebKitGamepads& webkit_data, |
| 12 PP_GamepadsSampleData* output_data) { | 12 PP_GamepadsSampleData* output_data) { |
| 13 output_data->length = webkit_data.length; | 13 output_data->length = webkit_data.length; |
| 14 for (unsigned i = 0; i < webkit_data.length; ++i) { | 14 for (unsigned i = 0; i < webkit_data.length; ++i) { |
| 15 PP_GamepadSampleData& output_pad = output_data->items[i]; | 15 PP_GamepadSampleData& output_pad = output_data->items[i]; |
| 16 const WebKitGamepad& webkit_pad = webkit_data.items[i]; | 16 const WebKitGamepad& webkit_pad = webkit_data.items[i]; |
| 17 output_pad.connected = webkit_pad.connected ? PP_TRUE : PP_FALSE; | 17 output_pad.connected = webkit_pad.connected ? PP_TRUE : PP_FALSE; |
| 18 if (webkit_pad.connected) { | 18 if (webkit_pad.connected) { |
| 19 COMPILE_ASSERT(sizeof(output_pad.id) == sizeof(webkit_pad.id), | 19 COMPILE_ASSERT(sizeof(output_pad.id) == sizeof(webkit_pad.id), |
| 20 id_size_does_not_match); | 20 id_size_does_not_match); |
| 21 COMPILE_ASSERT(sizeof(output_pad.axes) == sizeof(webkit_pad.axes), | |
| 22 axes_size_does_not_match); | |
| 23 memcpy(output_pad.id, webkit_pad.id, sizeof(output_pad.id)); | 21 memcpy(output_pad.id, webkit_pad.id, sizeof(output_pad.id)); |
| 24 output_pad.timestamp = webkit_pad.timestamp; | 22 output_pad.timestamp = webkit_pad.timestamp; |
| 25 output_pad.axes_length = webkit_pad.axes_length; | 23 output_pad.axes_length = webkit_pad.axes_length; |
| 26 memcpy(output_pad.axes, webkit_pad.axes, sizeof(output_pad.axes)); | 24 for (unsigned j = 0; j < webkit_pad.axes_length; ++j) |
| 25 output_pad.axes[j] = webkit_pad.axes[j]; | |
|
dmichael (off chromium)
2014/05/14 17:39:02
I would expect you to get a warning for loss of pr
Inactive
2014/05/14 17:49:50
My compiler did not complain but this is a good po
| |
| 27 output_pad.buttons_length = webkit_pad.buttons_length; | 26 output_pad.buttons_length = webkit_pad.buttons_length; |
| 28 | |
| 29 for (unsigned j = 0; j < webkit_pad.buttons_length; ++j) | 27 for (unsigned j = 0; j < webkit_pad.buttons_length; ++j) |
| 30 output_pad.buttons[j] = webkit_pad.buttons[j].value; | 28 output_pad.buttons[j] = webkit_pad.buttons[j].value; |
| 31 } | 29 } |
| 32 } | 30 } |
| 33 } | 31 } |
| 34 | 32 |
| 35 } // namespace ppapi | 33 } // namespace ppapi |
| OLD | NEW |