| 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 3f61474d0de77a2b3406d3e8cc43a7d605ec0a79..b6d048b641cbb150914cb16300977d07e273ad56 100644
|
| --- a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
|
| +++ b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
|
| @@ -60,6 +60,8 @@ static void sampleGamepads(ListType* into) {
|
| for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
|
| WebGamepad& webGamepad = gamepads.items[i];
|
| if (webGamepad.connected) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |item|, not |Item| below. */
|
| GamepadType* gamepad = into->item(i);
|
| if (!gamepad)
|
| gamepad = GamepadType::create();
|
|
|