| Index: third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
|
| diff --git a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
|
| index d865686d827fa6282e134458248ae655a8cf484e..86d68a669cf4aa87ad50800128ab795cb799545b 100644
|
| --- a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
|
| +++ b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
|
| @@ -57,9 +57,11 @@ static void sampleGamepads(ListType* into) {
|
|
|
| GamepadDispatcher::instance().sampleGamepads(gamepads);
|
|
|
| - for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
|
| - WebGamepad& webGamepad = gamepads.items[i];
|
| - if (webGamepad.connected) {
|
| + for (unsigned i = 0; i < WebGamepads::kItemsLengthCap; ++i) {
|
| + WebGamepad& web_gamepad = gamepads.items[i];
|
| + if (web_gamepad.connected) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |item|, not |Item| below. */
|
| GamepadType* gamepad = into->item(i);
|
| if (!gamepad)
|
| gamepad = GamepadType::create();
|
|
|