Changeset 295560 in webkit

Timestamp:

Jun 15, 2022 8:39:17 AM (2 years ago)

Author:

pvollan@apple.com

Message:

[GPUP] Send Audio component registrations from the UI process
​https://bugs.webkit.org/show_bug.cgi?id=241339
<rdar://88659991>

Reviewed by Geoffrey Garen.

Currently, Audio component registrations are only sent to the WebContent process. They should be sent to the GPU process as well.
This patch moves the existing registration code from the WebContent process code to the Auxiliary process code.

• Source/WebKit/GPUProcess/GPUProcess.messages.in:
• Source/WebKit/Shared/AuxiliaryProcess.h:
• Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm:

(WebKit::AuxiliaryProcess::consumeAudioComponentRegistrations):

• Source/WebKit/UIProcess/AuxiliaryProcessProxy.h:
• Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm: Added.

(WebKit::AuxiliaryProcessProxy::fetchAudioComponentServerRegistrations):

• Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm:

(WebKit::WebProcessProxy::sendAudioComponentRegistrations):

• Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:

(WebKit::GPUProcessProxy::didFinishLaunching):

• Source/WebKit/WebKit.xcodeproj/project.pbxproj:
• Source/WebKit/WebProcess/WebProcess.h:
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::consumeAudioComponentRegistrations): Deleted.

Canonical link: ​https://commits.webkit.org/251565@main

Location:

trunk/Source

Files:

• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/GPUProcess/GPUProcess.messages.in (modified) (1 diff)
• WebKit/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in (modified) (1 diff)
• WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb.in (modified) (1 diff)
• WebKit/Shared/AuxiliaryProcess.h (modified) (2 diffs)
• WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm (modified) (2 diffs)
• WebKit/UIProcess/AuxiliaryProcessProxy.h (modified) (1 diff)
• WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm (added)
• WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (modified) (3 diffs)
• WebKit/UIProcess/GPU/GPUProcessProxy.cpp (modified) (1 diff)
• WebKit/UIProcess/WebProcessPool.cpp (modified) (1 diff)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebKit/WebProcess/WebProcess.h (modified) (2 diffs)
• WebKit/WebProcess/WebProcess.messages.in (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WTF/wtf/PlatformHave.h

@@ -1237 +1237 @@
 #endif
 
+#if !defined(HAVE_AUDIO_COMPONENT_SERVER_REGISTRATIONS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
+#define HAVE_AUDIO_COMPONENT_SERVER_REGISTRATIONS 1
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000)
 #define HAVE_SHARING_SERVICE_PICKER_POPOVER_SPI 1

trunk/Source/WebKit/GPUProcess/GPUProcess.messages.in

@@ -92 +92 @@
 #endif
 
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+    ConsumeAudioComponentRegistrations(IPC::SharedBufferReference registrationData)
+#endif
+
 #if HAVE(POWERLOG_TASK_MODE_QUERY)
     EnablePowerLogging(WebKit::SandboxExtension::Handle handle)

trunk/Source/WebKit/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in

@@ -643 +643 @@
     (ipc-posix-name-prefix "AudioIO"))
 
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+(deny mach-lookup (with telemetry)
+    (global-name "com.apple.audio.AudioComponentRegistrar"))
+#else
 (allow mach-lookup
     (global-name "com.apple.audio.AudioComponentRegistrar"))
+#endif
 
 #if !ENABLE(CFPREFS_DIRECT_MODE)

trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb.in

@@ -694 +694 @@
     (xpc-service-name "com.apple.audio.toolbox.reporting.service")
 )
+
+(deny mach-lookup (with no-log) (with telemetry)
+    (global-name "com.apple.audio.AudioComponentRegistrar"))
 
 (deny mach-lookup (with telemetry)

trunk/Source/WebKit/Shared/AuxiliaryProcess.h

@@ -45 +45 @@
 OBJC_CLASS NSDictionary;
 
+namespace IPC {
+class SharedBufferReference;
+}
+
 namespace WebKit {
 
@@ -153 +157 @@
     void populateMobileGestaltCache(std::optional<SandboxExtension::Handle>&& mobileGestaltExtensionHandle);
 
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+    void consumeAudioComponentRegistrations(const IPC::SharedBufferReference&);
+#endif
+    
 private:
     virtual bool shouldOverrideQuarantine() { return true; }

trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm

@@ -47 +47 @@
 #endif
 
+#import <pal/cf/AudioToolboxSoftLink.h>
+
 #if HAVE(UPDATE_WEB_ACCESSIBILITY_SETTINGS) && ENABLE(CFPREFS_DIRECT_MODE)
 SOFT_LINK_LIBRARY_OPTIONAL(libAccessibility)
@@ -239 +241 @@
 }
 
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+void AuxiliaryProcess::consumeAudioComponentRegistrations(const IPC::SharedBufferReference& data)
+{
+    using namespace PAL;
+
+    if (!PAL::isAudioToolboxCoreFrameworkAvailable() || !PAL::canLoad_AudioToolboxCore_AudioComponentApplyServerRegistrations())
+        return;
+
+    if (data.isNull())
+        return;
+    auto registrations = data.unsafeBuffer()->createCFData();
+
+    auto err = AudioComponentApplyServerRegistrations(registrations.get());
+    if (noErr != err)
+        RELEASE_LOG_ERROR(Process, "Could not apply AudioComponent registrations, err(%ld)", static_cast<long>(err));
+}
+#endif
+
 } // namespace WebKit

trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h

@@ -178 +178 @@
     bool mayBecomeUnresponsive() override;
 
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+    static RefPtr<WebCore::SharedBuffer> fetchAudioComponentServerRegistrations();
+#endif
+
 private:
     virtual void connectionWillOpen(IPC::Connection&);

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm

@@ -41 +41 @@
 #import "WebProcessPool.h"
 #import <WebCore/RuntimeApplicationChecks.h>
-#import <WebCore/WebMAudioUtilitiesCocoa.h>
 #import <sys/sysctl.h>
 #import <wtf/NeverDestroyed.h>
@@ -67 +66 @@
 #endif
 
-#import <pal/cf/AudioToolboxSoftLink.h>
-
 namespace WebKit {
 
@@ -271 +268 @@
 #endif
 
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
 void WebProcessProxy::sendAudioComponentRegistrations()
 {
-    using namespace PAL;
-
-    if (!PAL::isAudioToolboxCoreFrameworkAvailable() || !PAL::canLoad_AudioToolboxCore_AudioComponentFetchServerRegistrations())
-        return;
-
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [weakThis = WeakPtr { *this }] () mutable {
-        CFDataRef registrations { nullptr };
-
-        WebCore::registerOpusDecoderIfNeeded();
-        WebCore::registerVorbisDecoderIfNeeded();
-        if (noErr != AudioComponentFetchServerRegistrations(&registrations) || !registrations)
+
+        auto registrations = fetchAudioComponentServerRegistrations();
+        if (!registrations)
             return;
-
-        RunLoop::main().dispatch([weakThis = WTFMove(weakThis), registrations = adoptCF(registrations)] () {
+        
+        RunLoop::main().dispatch([weakThis = WTFMove(weakThis), registrations = WTFMove(registrations)] () mutable {
             if (!weakThis)
                 return;
 
-            auto registrationData = WebCore::SharedBuffer::create(registrations.get());
-            weakThis->send(Messages::WebProcess::ConsumeAudioComponentRegistrations(IPC::SharedBufferReference(WTFMove(registrationData))), 0);
+            weakThis->send(Messages::WebProcess::ConsumeAudioComponentRegistrations(IPC::SharedBufferReference(WTFMove(registrations))), 0);
         });
     });
 }
+#endif
 
 bool WebProcessProxy::messageSourceIsValidWebContentProcess()

trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp

@@ -170 +170 @@
     // Initialize the GPU process.
     send(Messages::GPUProcess::InitializeGPUProcess(parameters), 0);
+
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+    auto registrations = fetchAudioComponentServerRegistrations();
+    if (registrations)
+        send(Messages::GPUProcess::ConsumeAudioComponentRegistrations(IPC::SharedBufferReference(WTFMove(registrations))), 0);
+#endif
+
     updateProcessAssertion();
 }

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -912 +912 @@
 #endif
 
-#if PLATFORM(COCOA)
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
     process.sendAudioComponentRegistrations();
 #endif

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -2246 +2246 @@
                 E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */; };
                 E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; };
+                E326E357284E580E00157372 /* AuxiliaryProcessProcyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = E326E356284E580E00157372 /* AuxiliaryProcessProcyCocoa.mm */; };
                 E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = E36FF00127F36FBD004BE21A /* SandboxStateVariables.h */; };
                 E36FF00427F36FBD004BE21A /* preferences.sb in Resources */ = {isa = PBXBuildFile; fileRef = E36FF00227F36FBD004BE21A /* preferences.sb */; };
@@ -7020 +7021 @@
                 E30CFB9D2660663C0094D9C0 /* com.apple.WebKit.WebContent.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebKit.WebContent.sb; path = DerivedSources/WebKit/com.apple.WebKit.WebContent.sb; sourceTree = BUILT_PRODUCTS_DIR; };
                 E313664D265EE5AF0051084F /* com.apple.WebKit.WebContent.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.WebContent.sb.in; sourceTree = "<group>"; };
+                E326E356284E580E00157372 /* AuxiliaryProcessProcyCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AuxiliaryProcessProcyCocoa.mm; sourceTree = "<group>"; };
                 E3439B632345463A0011DE0B /* NetworkProcessConnectionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NetworkProcessConnectionInfo.h; path = Network/NetworkProcessConnectionInfo.h; sourceTree = "<group>"; };
                 E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libWebCoreTestShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -8230 +8232 @@
                                 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */,
                                 C1710CF224A7BD0300D7C112 /* XPCEventHandler.h */,
+                                E326E356284E580E00157372 /* AuxiliaryProcessProcyCocoa.mm */,
                         );
                         path = Cocoa;
@@ -16801 +16804 @@
                                 2D11B7622126A282006F8878 /* UnifiedSource9.cpp in Sources */,
                                 2D11B7632126A282006F8878 /* UnifiedSource10-mm.mm in Sources */,
+                                E326E357284E580E00157372 /* AuxiliaryProcessProcyCocoa.mm in Sources */,
                                 2D11B7642126A282006F8878 /* UnifiedSource10.cpp in Sources */,
                                 2D11B7652126A282006F8878 /* UnifiedSource11-mm.mm in Sources */,

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -79 +79 @@
 }
 
-namespace IPC {
-class SharedBufferReference;
-}
-
 namespace PAL {
 class SessionID;
@@ -534 +530 @@
 #endif
 
-#if PLATFORM(COCOA)
-    void consumeAudioComponentRegistrations(const IPC::SharedBufferReference&);
-#endif
-    
     void platformInitializeProcess(const AuxiliaryProcessInitializationParameters&);
 

trunk/Source/WebKit/WebProcess/WebProcess.messages.in

@@ -195 +195 @@
 #endif
 
-#if PLATFORM(COCOA)
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
     ConsumeAudioComponentRegistrations(IPC::SharedBufferReference registrationData)
+#endif
+
+#if PLATFORM(COCOA)
     AccessibilityPreferencesDidChange(struct WebKit::AccessibilityPreferences accessibilityPreferences)
 #endif

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -162 +162 @@
 
 #import <WebCore/MediaAccessibilitySoftLink.h>
-#import <pal/cf/AudioToolboxSoftLink.h>
 #import <pal/cf/VideoToolboxSoftLink.h>
 #import <pal/cocoa/AVFoundationSoftLink.h>
@@ -1256 +1255 @@
 #endif
 
-void WebProcess::consumeAudioComponentRegistrations(const IPC::SharedBufferReference& data)
-{
-    using namespace PAL;
-
-    if (!PAL::isAudioToolboxCoreFrameworkAvailable() || !PAL::canLoad_AudioToolboxCore_AudioComponentApplyServerRegistrations())
-        return;
-
-    if (data.isNull())
-        return;
-    auto registrations = data.unsafeBuffer()->createCFData();
-
-    auto err = AudioComponentApplyServerRegistrations(registrations.get());
-    if (noErr != err)
-        WEBPROCESS_RELEASE_LOG_ERROR(Process, "Could not apply AudioComponent registrations, err(%ld)", static_cast<long>(err));
-}
-
 #if PLATFORM(MAC)
 void WebProcess::openDirectoryCacheInvalidated(SandboxExtension::Handle&& handle)