[macOS Big Sur] ASSERTION FAILED: !m_gamepadMap.get(device)./platform/gamepad/mac/HIDGamepadProvider.mm(233) under WebCore::HIDGamepadProvider::deviceAdded

cdumez · cdumez · commit 4619da373d3a · 2020-09-18T16:43:40.000Z
https://bugs.webkit.org/show_bug.cgi?id=216665 <rdar://problem/68641574> Reviewed by Alex Christensen. On macOS Big Sur, it appears we get notified multiple times that the Shenzhen Longshengwei Technology Gamepad is getting added during Gamepad.GCFVersusHID API test. This was causing an assertion to be hit under HIDGamepadProvider::deviceAdded() where we expected the device not not already be in the map. In this patch, we work around this HID quirk on Big Sur by ignoring the notification if we already know about the device. No new tests, fixes existing API test. * platform/gamepad/mac/HIDGamepadProvider.mm: (WebCore::HIDGamepadProvider::deviceAdded): Canonical link: https://commits.webkit.org/229504@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267241 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2020-09-18  Chris Dumez  <cdumez@apple.com>
+
+        [macOS Big Sur] ASSERTION FAILED: !m_gamepadMap.get(device)./platform/gamepad/mac/HIDGamepadProvider.mm(233) under WebCore::HIDGamepadProvider::deviceAdded
+        https://bugs.webkit.org/show_bug.cgi?id=216665
+        <rdar://problem/68641574>
+
+        Reviewed by Alex Christensen.
+
+        On macOS Big Sur, it appears we get notified multiple times that the Shenzhen Longshengwei Technology Gamepad
+        is getting added during Gamepad.GCFVersusHID API test. This was causing an assertion to be hit under
+        HIDGamepadProvider::deviceAdded() where we expected the device not not already be in the map. In this patch,
+        we work around this HID quirk on Big Sur by ignoring the notification if we already know about the device.
+
+        No new tests, fixes existing API test.
+
+        * platform/gamepad/mac/HIDGamepadProvider.mm:
+        (WebCore::HIDGamepadProvider::deviceAdded):
+
 2020-09-18  Chris Dumez  <cdumez@apple.com>
 
         Vectorize SetTargetAtTime processing in AudioParamTimeline
diff --git a/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.mm b/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.mm
@@ -230,7 +230,9 @@ static GameControllerFrameworkHandlesDevice gameControllerFrameworkWillHandleHID
     }
 #endif
 
-    ASSERT(!m_gamepadMap.get(device));
+    // HID sometimes notifies us multiple times for the same device.
+    if (m_gamepadMap.contains(device))
+        return;
 
     LOG(Gamepad, "HIDGamepadProvider device %p added", device);
 

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,9 @@ static GameControllerFrameworkHandlesDevice gameControllerFrameworkWillHandleHID`
`230`	`230`	`}`
`231`	`231`	`#endif`
`232`	`232`
`233`		`- ASSERT(!m_gamepadMap.get(device));`
	`233`	`+ // HID sometimes notifies us multiple times for the same device.`
	`234`	`+ if (m_gamepadMap.contains(device))`
	`235`	`+ return;`
`234`	`236`
`235`	`237`	`LOG(Gamepad, "HIDGamepadProvider device %p added", device);`
`236`	`238`