[SaferCPP] Fix smart pointer fails in WKMockMediaDevice.cpp & WKMessageListener.cpp

zakariaridouh · zakariaridouh · commit ad18f31bb8ac · 2025-06-23T20:30:43.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=294870 <rdar://154137011> Reviewed by Chris Dumez. Fix smart pointer fails in `WKMockMediaDevice.cpp` & `WKMessageListener.cpp` * Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations: * Source/WebKit/UIProcess/API/C/WKMessageListener.cpp: (WKMessageListenerSendReply): * Source/WebKit/UIProcess/API/C/WKMockMediaDevice.cpp: (WKAddMockMediaDevice): (WKClearMockMediaDevices): (WKRemoveMockMediaDevice): (WKResetMockMediaDevices): (WKSetMockMediaDeviceIsEphemeral): Canonical link: https://commits.webkit.org/296546@main
diff --git a/Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations b/Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations
@@ -22,8 +22,6 @@ UIProcess/API/C/WKGeolocationPermissionRequest.cpp
 UIProcess/API/C/WKHTTPCookieStoreRef.cpp
 UIProcess/API/C/WKInspector.cpp
 UIProcess/API/C/WKMediaKeySystemPermissionCallback.cpp
-UIProcess/API/C/WKMessageListener.cpp
-UIProcess/API/C/WKMockMediaDevice.cpp
 UIProcess/API/C/WKNotification.cpp
 UIProcess/API/C/WKNotificationManager.cpp
 UIProcess/API/C/WKNotificationPermissionRequest.cpp
diff --git a/Source/WebKit/UIProcess/API/C/WKMessageListener.cpp b/Source/WebKit/UIProcess/API/C/WKMessageListener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2025 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -38,5 +38,5 @@ WKTypeID WKMessageListenerGetTypeID()
 
 void WKMessageListenerSendReply(WKMessageListenerRef listenerRef, WKTypeRef value)
 {
-    toImpl(listenerRef)->sendReply(toImpl(value));
+    toProtectedImpl(listenerRef)->sendReply(toImpl(value));
 }
diff --git a/Source/WebKit/UIProcess/API/C/WKMockMediaDevice.cpp b/Source/WebKit/UIProcess/API/C/WKMockMediaDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2025 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -39,7 +39,7 @@ using namespace WebKit;
 void WKAddMockMediaDevice(WKContextRef context, WKStringRef persistentId, WKStringRef label, WKStringRef type, WKDictionaryRef properties, bool isDefault)
 {
 #if ENABLE(MEDIA_STREAM)
-    String typeString = WebKit::toImpl(type)->string();
+    String typeString = WebKit::toProtectedImpl(type)->string();
     Variant<WebCore::MockMicrophoneProperties, WebCore::MockSpeakerProperties, WebCore::MockCameraProperties, WebCore::MockDisplayProperties> deviceProperties;
     if (typeString == "camera"_s) {
         WebCore::MockCameraProperties cameraProperties;
@@ -72,26 +72,26 @@ void WKAddMockMediaDevice(WKContextRef context, WKStringRef persistentId, WKStri
         }
     }
 
-    toImpl(context)->addMockMediaDevice({ WebKit::toImpl(persistentId)->string(), WebKit::toImpl(label)->string(), flags, isDefault, WTFMove(deviceProperties) });
+    toProtectedImpl(context)->addMockMediaDevice({ WebKit::toProtectedImpl(persistentId)->string(), WebKit::toProtectedImpl(label)->string(), flags, isDefault, WTFMove(deviceProperties) });
 #endif
 }
 
 void WKClearMockMediaDevices(WKContextRef context)
 {
-    toImpl(context)->clearMockMediaDevices();
+    toProtectedImpl(context)->clearMockMediaDevices();
 }
 
 void WKRemoveMockMediaDevice(WKContextRef context, WKStringRef persistentId)
 {
-    toImpl(context)->removeMockMediaDevice(WebKit::toImpl(persistentId)->string());
+    toProtectedImpl(context)->removeMockMediaDevice(WebKit::toProtectedImpl(persistentId)->string());
 }
 
 void WKResetMockMediaDevices(WKContextRef context)
 {
-    toImpl(context)->resetMockMediaDevices();
+    toProtectedImpl(context)->resetMockMediaDevices();
 }
 
 void WKSetMockMediaDeviceIsEphemeral(WKContextRef context, WKStringRef persistentId, bool isEphemeral)
 {
-    toImpl(context)->setMockMediaDeviceIsEphemeral(WebKit::toImpl(persistentId)->string(), isEphemeral);
+    toProtectedImpl(context)->setMockMediaDeviceIsEphemeral(WebKit::toProtectedImpl(persistentId)->string(), isEphemeral);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2019 Apple Inc. All rights reserved.`
	`2`	`+ * Copyright (C) 2019-2025 Apple Inc. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Redistribution and use in source and binary forms, with or without`
`5`	`5`	`* modification, are permitted provided that the following conditions`
`@@ -38,5 +38,5 @@ WKTypeID WKMessageListenerGetTypeID()`
`38`	`38`
`39`	`39`	`void WKMessageListenerSendReply(WKMessageListenerRef listenerRef, WKTypeRef value)`
`40`	`40`	`{`
`41`		`- toImpl(listenerRef)->sendReply(toImpl(value));`
	`41`	`+ toProtectedImpl(listenerRef)->sendReply(toImpl(value));`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2018 Apple Inc. All rights reserved.`
	`2`	`+ * Copyright (C) 2018-2025 Apple Inc. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Redistribution and use in source and binary forms, with or without`
`5`	`5`	`* modification, are permitted provided that the following conditions`
`@@ -39,7 +39,7 @@ using namespace WebKit;`
`39`	`39`	`void WKAddMockMediaDevice(WKContextRef context, WKStringRef persistentId, WKStringRef label, WKStringRef type, WKDictionaryRef properties, bool isDefault)`
`40`	`40`	`{`
`41`	`41`	`#if ENABLE(MEDIA_STREAM)`
`42`		`- String typeString = WebKit::toImpl(type)->string();`
	`42`	`+ String typeString = WebKit::toProtectedImpl(type)->string();`
`43`	`43`	`Variant<WebCore::MockMicrophoneProperties, WebCore::MockSpeakerProperties, WebCore::MockCameraProperties, WebCore::MockDisplayProperties> deviceProperties;`
`44`	`44`	`if (typeString == "camera"_s) {`
`45`	`45`	`WebCore::MockCameraProperties cameraProperties;`
`@@ -72,26 +72,26 @@ void WKAddMockMediaDevice(WKContextRef context, WKStringRef persistentId, WKStri`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- toImpl(context)->addMockMediaDevice({ WebKit::toImpl(persistentId)->string(), WebKit::toImpl(label)->string(), flags, isDefault, WTFMove(deviceProperties) });`
	`75`	`+ toProtectedImpl(context)->addMockMediaDevice({ WebKit::toProtectedImpl(persistentId)->string(), WebKit::toProtectedImpl(label)->string(), flags, isDefault, WTFMove(deviceProperties) });`
`76`	`76`	`#endif`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`void WKClearMockMediaDevices(WKContextRef context)`
`80`	`80`	`{`
`81`		`- toImpl(context)->clearMockMediaDevices();`
	`81`	`+ toProtectedImpl(context)->clearMockMediaDevices();`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`void WKRemoveMockMediaDevice(WKContextRef context, WKStringRef persistentId)`
`85`	`85`	`{`
`86`		`- toImpl(context)->removeMockMediaDevice(WebKit::toImpl(persistentId)->string());`
	`86`	`+ toProtectedImpl(context)->removeMockMediaDevice(WebKit::toProtectedImpl(persistentId)->string());`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`void WKResetMockMediaDevices(WKContextRef context)`
`90`	`90`	`{`
`91`		`- toImpl(context)->resetMockMediaDevices();`
	`91`	`+ toProtectedImpl(context)->resetMockMediaDevices();`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`void WKSetMockMediaDeviceIsEphemeral(WKContextRef context, WKStringRef persistentId, bool isEphemeral)`
`95`	`95`	`{`
`96`		`- toImpl(context)->setMockMediaDeviceIsEphemeral(WebKit::toImpl(persistentId)->string(), isEphemeral);`
	`96`	`+ toProtectedImpl(context)->setMockMediaDeviceIsEphemeral(WebKit::toProtectedImpl(persistentId)->string(), isEphemeral);`
`97`	`97`	`}`