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

Unified Diff: content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm

Issue 1925953002: Ignore HID elements in extraneous application collections on OSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « content/browser/gamepad/gamepad_platform_data_fetcher_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
index 4d55c5585621b71194d03a07c10419be2f2fec28..fe77f536303674fafb4aab7c3df6466c1625f37c 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
@@ -156,6 +156,23 @@ void GamepadPlatformDataFetcherMac::ValueChangedCallback(void* context,
InstanceFromContext(context)->ValueChanged(ref);
}
+bool GamepadPlatformDataFetcherMac::CheckCollection(IOHIDElementRef element) {
+ // Check that a parent collection of this element matches one of the usage
+ // numbers that we are looking for.
+ while ((element = IOHIDElementGetParent(element)) != NULL) {
+ uint32_t usage_page = IOHIDElementGetUsagePage(element);
+ uint32_t usage = IOHIDElementGetUsage(element);
+ if (usage_page == kGenericDesktopUsagePage) {
+ if (usage == kJoystickUsageNumber ||
+ usage == kGameUsageNumber ||
+ usage == kMultiAxisUsageNumber) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
bool GamepadPlatformDataFetcherMac::AddButtonsAndAxes(NSArray* elements,
size_t slot) {
WebGamepad& pad = pad_state_[slot].data;
@@ -172,6 +189,9 @@ bool GamepadPlatformDataFetcherMac::AddButtonsAndAxes(NSArray* elements,
for (id elem in elements) {
IOHIDElementRef element = reinterpret_cast<IOHIDElementRef>(elem);
+ if (!CheckCollection(element))
+ continue;
+
uint32_t usage_page = IOHIDElementGetUsagePage(element);
uint32_t usage = IOHIDElementGetUsage(element);
if (IOHIDElementGetType(element) == kIOHIDElementTypeInput_Button &&
@@ -202,6 +222,9 @@ bool GamepadPlatformDataFetcherMac::AddButtonsAndAxes(NSArray* elements,
uint32_t next_index = 0;
for (id elem in elements) {
IOHIDElementRef element = reinterpret_cast<IOHIDElementRef>(elem);
+ if (!CheckCollection(element))
+ continue;
+
uint32_t usage_page = IOHIDElementGetUsagePage(element);
uint32_t usage = IOHIDElementGetUsage(element);
if (IOHIDElementGetType(element) == kIOHIDElementTypeInput_Misc &&
« no previous file with comments | « content/browser/gamepad/gamepad_platform_data_fetcher_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698