Title: [264883] trunk/Source/WebCore
- Revision
- 264883
- Author
- [email protected]
- Date
- 2020-07-24 21:37:43 -0700 (Fri, 24 Jul 2020)
Log Message
Another (bizarre?) attempted build fix after r264874
* platform/gamepad/cocoa/GameControllerGamepadProvider.mm:
(WebCore::GameControllerGamepadProvider::controllerDidConnect): The CFSTR macro was wonky
for unknown reasons...? Let's try it this way.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (264882 => 264883)
--- trunk/Source/WebCore/ChangeLog 2020-07-25 03:52:47 UTC (rev 264882)
+++ trunk/Source/WebCore/ChangeLog 2020-07-25 04:37:43 UTC (rev 264883)
@@ -1,5 +1,13 @@
2020-07-24 Brady Eidson <[email protected]>
+ Another (bizarre?) attempted build fix after r264874
+
+ * platform/gamepad/cocoa/GameControllerGamepadProvider.mm:
+ (WebCore::GameControllerGamepadProvider::controllerDidConnect): The CFSTR macro was wonky
+ for unknown reasons...? Let's try it this way.
+
+2020-07-24 Brady Eidson <[email protected]>
+
Build fix after r264874
Remove all nullability specifiers because just having one goes viral.
Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm (264882 => 264883)
--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm 2020-07-25 03:52:47 UTC (rev 264882)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm 2020-07-25 04:37:43 UTC (rev 264883)
@@ -109,8 +109,8 @@
if (!serviceInfo.service)
continue;
- auto cfVendorID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, CFSTR(kIOHIDVendorIDKey)));
- auto cfProductID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, CFSTR(kIOHIDProductIDKey)));
+ auto cfVendorID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, (__bridge CFStringRef)@(kIOHIDVendorIDKey)));
+ auto cfProductID = adoptCF((CFNumberRef)IOHIDServiceClientCopyProperty(serviceInfo.service, (__bridge CFStringRef)@(kIOHIDProductIDKey)));
int vendorID, productID;
CFNumberGetValue(cfVendorID.get(), kCFNumberIntType, &vendorID);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
