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

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

Issue 1136463002: Pass correct length value in WebGamepads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use std::min for comparison Created 5 years, 7 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 | « ppapi/examples/gamepad/gamepad.cc ('k') | no next file » | 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 #include "ppapi/shared_impl/ppb_gamepad_shared.h" 5 #include "ppapi/shared_impl/ppb_gamepad_shared.h"
6 6
7 #include <algorithm>
8
7 #include "base/basictypes.h" 9 #include "base/basictypes.h"
8 10
9 namespace ppapi { 11 namespace ppapi {
10 12
11 void ConvertWebKitGamepadData(const WebKitGamepads& webkit_data, 13 void ConvertWebKitGamepadData(const WebKitGamepads& webkit_data,
12 PP_GamepadsSampleData* output_data) { 14 PP_GamepadsSampleData* output_data) {
13 output_data->length = webkit_data.length; 15 size_t length = std::min(WebKitGamepads::kItemsLengthCap,
14 for (unsigned i = 0; i < webkit_data.length; ++i) { 16 (const size_t)webkit_data.length);
bbudge 2015/05/08 17:31:52 Use C++ style cast. Also, you could avoid a cast b
arajp 2015/05/11 10:40:40 Changed to C++ style cast. Changing length to uint
bbudge 2015/05/11 11:21:29 Would using 'unsigned' to match WebKitGamepads hel
arajp 2015/05/11 11:29:20 Done.
17 output_data->length = static_cast<uint32_t>(length);
18 for (unsigned i = 0; i < length; ++i) {
15 PP_GamepadSampleData& output_pad = output_data->items[i]; 19 PP_GamepadSampleData& output_pad = output_data->items[i];
16 const WebKitGamepad& webkit_pad = webkit_data.items[i]; 20 const WebKitGamepad& webkit_pad = webkit_data.items[i];
17 output_pad.connected = webkit_pad.connected ? PP_TRUE : PP_FALSE; 21 output_pad.connected = webkit_pad.connected ? PP_TRUE : PP_FALSE;
18 if (webkit_pad.connected) { 22 if (webkit_pad.connected) {
19 static_assert(sizeof(output_pad.id) == sizeof(webkit_pad.id), 23 static_assert(sizeof(output_pad.id) == sizeof(webkit_pad.id),
20 "id size does not match"); 24 "id size does not match");
21 memcpy(output_pad.id, webkit_pad.id, sizeof(output_pad.id)); 25 memcpy(output_pad.id, webkit_pad.id, sizeof(output_pad.id));
22 output_pad.timestamp = static_cast<double>(webkit_pad.timestamp); 26 output_pad.timestamp = static_cast<double>(webkit_pad.timestamp);
23 output_pad.axes_length = webkit_pad.axes_length; 27 output_pad.axes_length = webkit_pad.axes_length;
24 for (unsigned j = 0; j < webkit_pad.axes_length; ++j) 28 for (unsigned j = 0; j < webkit_pad.axes_length; ++j)
25 output_pad.axes[j] = static_cast<float>(webkit_pad.axes[j]); 29 output_pad.axes[j] = static_cast<float>(webkit_pad.axes[j]);
26 output_pad.buttons_length = webkit_pad.buttons_length; 30 output_pad.buttons_length = webkit_pad.buttons_length;
27 for (unsigned j = 0; j < webkit_pad.buttons_length; ++j) 31 for (unsigned j = 0; j < webkit_pad.buttons_length; ++j)
28 output_pad.buttons[j] = static_cast<float>(webkit_pad.buttons[j].value); 32 output_pad.buttons[j] = static_cast<float>(webkit_pad.buttons[j].value);
29 } 33 }
30 } 34 }
31 } 35 }
32 36
33 } // namespace ppapi 37 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/examples/gamepad/gamepad.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698