Fix button 1 being stuck down on certain Logitech gamepads on Windows

content/browser/gamepad/raw_input_data_fetcher_win.cc

 // Copyright 2014 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 "content/browser/gamepad/raw_input_data_fetcher_win.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 16 matching lines @@
 
 // From the HID Usage Tables specification.
 USHORT DeviceUsages[] = {
   0x04,  // Joysticks
   0x05,  // Gamepads
   0x08,  // Multi Axis
 };
 
 const uint32_t kAxisMinimumUsageNumber = 0x30;
 const uint32_t kGameControlsUsagePage = 0x05;
+const uint32_t kButtonUsagePage = 0x09;
 
 }  // namespace
 
 RawGamepadInfo::RawGamepadInfo() {
 }
 
 RawGamepadInfo::~RawGamepadInfo() {
 }
 
 RawInputDataFetcher::RawInputDataFetcher()
@@ skipping 242 matching lines @@
   // Query button information.
   USHORT count = caps.NumberInputButtonCaps;
   if (count > 0) {
     std::unique_ptr<HIDP_BUTTON_CAPS[]> button_caps(
         new HIDP_BUTTON_CAPS[count]);
     status = hidp_get_button_caps_(
         HidP_Input, button_caps.get(), &count, gamepad_info->preparsed_data);
     DCHECK_EQ(HIDP_STATUS_SUCCESS, status);
 
     for (uint32_t i = 0; i < count; ++i) {
-      if (button_caps[i].Range.UsageMin <= WebGamepad::buttonsLengthCap) {
+      if (button_caps[i].Range.UsageMin <= WebGamepad::buttonsLengthCap &&
+          button_caps[i].UsagePage == kButtonUsagePage) {
         uint32_t max_index =
             std::min(WebGamepad::buttonsLengthCap,
                      static_cast<size_t>(button_caps[i].Range.UsageMax));
         gamepad_info->buttons_length = std::max(
             gamepad_info->buttons_length, max_index);
       }
     }
   }
 
   // Query axis information.
@@ skipping 78 matching lines @@
                             usages.get(),
                             &buttons_length,
                             gamepad_info->preparsed_data,
                             reinterpret_cast<PCHAR>(input->data.hid.bRawData),
                             input->data.hid.dwSizeHid);
 
     if (status == HIDP_STATUS_SUCCESS) {
       // Set each reported button to true.
       for (uint32_t j = 0; j < buttons_length; j++) {
         int32_t button_index = usages[j].Usage - 1;
-        if (button_index >= 0 &&
+        if (usages[j].UsagePage == kButtonUsagePage &&
+            button_index >= 0 &&
             button_index <
                 static_cast<int>(blink::WebGamepad::buttonsLengthCap)) {
           gamepad_info->buttons[button_index] = true;
         }
       }
     }
   }
 
   // Query axis state.
   ULONG axis_value = 0;
@@ skipping 111 matching lines @@
     return false;
   hidd_get_product_string_ = reinterpret_cast<HidDGetStringFunc>(
       hid_dll_.GetFunctionPointer("HidD_GetProductString"));
   if (!hidd_get_product_string_)
     return false;
 
   return true;
 }
 
 }  // namespace content