diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 20:00:29 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 20:00:29 +0000 |
| commit | dae9f0364754a199a3cb89c1b40a644e3d592aaa (patch) | |
| tree | 4d19dd7dc6bbc19619db3e7911488757d750ae28 | |
| parent | a7f9e6b34606191cd70d5c4c3293c9745d9df173 (diff) | |
| download | chromium_src-dae9f0364754a199a3cb89c1b40a644e3d592aaa.zip chromium_src-dae9f0364754a199a3cb89c1b40a644e3d592aaa.tar.gz chromium_src-dae9f0364754a199a3cb89c1b40a644e3d592aaa.tar.bz2 | |
Gamepad: Gamepads length should be maximum supported.
On Windows and Linux, the length of gamepads reported is always 4. On Mac, it's different, and varies based on the number of controllers that are connected. For consistency, this change makes Chromium report data for 4 controllers on Mac.
Tested:
Ran the gamepad example, and verified that it now reports 4 controllers. I connected a gamepad and it reported 1 connected and 3 disconnected.
BUG=229586
Review URL: https://codereview.chromium.org/14299003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194426 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm index 8748730..84bad06 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm @@ -301,7 +301,7 @@ void GamepadPlatformDataFetcherMac::GetGamepadData( // Copy to the current state to the output buffer, using the mapping // function, if there is one available. - pads->length = data_.length; + pads->length = WebKit::WebGamepads::itemsLengthCap; for (size_t i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) { if (associated_[i].mapper) associated_[i].mapper(data_.items[i], &pads->items[i]); |