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

Unified Diff: third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698