Fix use of arraysize in GamepadProvider

content/browser/gamepad/gamepad_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 153 matching lines @@
 void GamepadProvider::SendPauseHint(bool paused) {
   DCHECK(base::MessageLoop::current() == polling_thread_->message_loop());
   if (data_fetcher_)
     data_fetcher_->PauseHint(paused);
 }
 
 bool GamepadProvider::PadState::Match(const WebGamepad& pad) const {
   return connected_ == pad.connected &&
          axes_length_ == pad.axesLength &&
          buttons_length_ == pad.buttonsLength &&
-         memcmp(id_, pad.id, arraysize(id_)) == 0 &&
-         memcmp(mapping_, pad.mapping, arraysize(mapping_)) == 0;
+         memcmp(id_, pad.id, arraysize(id_) * sizeof(id_[0])) == 0 &&

[inferno, 2015/03/20 15:13:26]

why not just sizeof(id_) ? same at all other places ?

[kenrb, 2015/03/20 15:53:02]

I kind of like arraysize because it gives a compile error if you use it
incorrectly, but now that you point it out, it is much cleaner just to use
sizeof correctly.

+         memcmp(mapping_, pad.mapping,
+            arraysize(mapping_) * sizeof(mapping_[0])) == 0;
 }
 
 void GamepadProvider::PadState::SetPad(const WebGamepad& pad) {
   connected_ = pad.connected;
   axes_length_ = pad.axesLength;
   buttons_length_ = pad.buttonsLength;
-  memcpy(id_, pad.id, arraysize(id_));
-  memcpy(mapping_, pad.mapping, arraysize(mapping_));
+  memcpy(id_, pad.id, arraysize(id_) * sizeof(id_[0]));
+  memcpy(mapping_, pad.mapping, arraysize(mapping_) * sizeof(mapping_[0]));
 }
 
 void GamepadProvider::PadState::SetDisconnected() {
   connected_ = false;
   axes_length_ = 0;
   buttons_length_ = 0;
-  memset(id_, 0, arraysize(id_));
-  memset(mapping_, 0, arraysize(mapping_));
+  memset(id_, 0, arraysize(id_) * sizeof(id_[0]));
+  memset(mapping_, 0, arraysize(mapping_) * sizeof(mapping_[0]));
 }
 
 void GamepadProvider::PadState::AsWebGamepad(WebGamepad* pad) {
   pad->connected = connected_;
   pad->axesLength = axes_length_;
   pad->buttonsLength = buttons_length_;
-  memcpy(pad->id, id_, arraysize(id_));
-  memcpy(pad->mapping, mapping_, arraysize(mapping_));
-  memset(pad->axes, 0, arraysize(pad->axes));
-  memset(pad->buttons, 0, arraysize(pad->buttons));
+  memcpy(pad->id, id_, arraysize(id_) * sizeof(id_[0]));
+  memcpy(pad->mapping, mapping_, arraysize(mapping_) * sizeof(mapping_[0]));
+  memset(pad->axes, 0, arraysize(pad->axes) * sizeof(pad->axes[0]));
+  memset(pad->buttons, 0, arraysize(pad->buttons) * sizeof(pad->buttons[0]));
 }
 
 void GamepadProvider::DoPoll() {
   DCHECK(base::MessageLoop::current() == polling_thread_->message_loop());
   DCHECK(have_scheduled_do_poll_);
   have_scheduled_do_poll_ = false;
 
   bool changed;
   GamepadHardwareBuffer* hwbuf = SharedMemoryAsHardwareBuffer();
 
@@ skipping 108 matching lines @@
   }
   if (!had_gesture_before && ever_had_user_gesture_) {
     // Initialize pad_states_ for the first time.
     for (size_t i = 0; i < WebGamepads::itemsLengthCap; ++i) {
       pad_states_.get()[i].SetPad(pads.items[i]);
     }
   }
 }
 
 }  // namespace content