Title: [264884] trunk/Source/WebCore
Revision
264884
Author
[email protected]
Date
2020-07-24 21:54:37 -0700 (Fri, 24 Jul 2020)

Log Message

Yet another (bizarre?) attempted build fix after r264874

* platform/gamepad/cocoa/GameControllerGamepadProvider.mm:
(WebCore::GameControllerGamepadProvider::controllerDidConnect): The last attempt revealed the real
  problem - missing declaration for this function. *sigh*

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (264883 => 264884)


--- trunk/Source/WebCore/ChangeLog	2020-07-25 04:37:43 UTC (rev 264883)
+++ trunk/Source/WebCore/ChangeLog	2020-07-25 04:54:37 UTC (rev 264884)
@@ -1,5 +1,13 @@
 2020-07-24  Brady Eidson  <[email protected]>
 
+        Yet another (bizarre?) attempted build fix after r264874
+
+        * platform/gamepad/cocoa/GameControllerGamepadProvider.mm:
+        (WebCore::GameControllerGamepadProvider::controllerDidConnect): The last attempt revealed the real
+          problem - missing declaration for this function. *sigh*
+
+2020-07-24  Brady Eidson  <[email protected]>
+
         Another (bizarre?) attempted build fix after r264874
 
         * platform/gamepad/cocoa/GameControllerGamepadProvider.mm:

Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm (264883 => 264884)


--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm	2020-07-25 04:37:43 UTC (rev 264883)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm	2020-07-25 04:54:37 UTC (rev 264884)
@@ -34,6 +34,10 @@
 #import <GameController/GameController.h>
 #import <wtf/NeverDestroyed.h>
 
+#if HAVE(MULTIGAMEPADPROVIDER_SUPPORT) && !HAVE(GCCONTROLLER_HID_DEVICE_CHECK)
+#import <IOKit/hid/IOHIDServiceClient.h>
+#endif
+
 #import "GameControllerSoftLink.h"
 
 namespace WebCore {
@@ -109,8 +113,8 @@
         if (!serviceInfo.service)
             continue;
 
-        auto cfVendorID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, (__bridge CFStringRef)@(kIOHIDVendorIDKey)));
-        auto cfProductID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, (__bridge CFStringRef)@(kIOHIDProductIDKey)));
+        auto cfVendorID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, CFSTR(kIOHIDVendorIDKey)));
+        auto cfProductID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, CFSTR(kIOHIDProductIDKey)));
 
         int vendorID, productID;
         CFNumberGetValue(cfVendorID.get(), kCFNumberIntType, &vendorID);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to