Changeset 285479 in webkit

Timestamp:

Nov 8, 2021, 8:23:23 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r285432.
​https://bugs.webkit.org/show_bug.cgi?id=232864

Introduced audio capture regression

Reverted changeset:

"[macOS][GPUP] Remove access in sandbox to
com.apple.audio.AudioComponentRegistrar"
​https://bugs.webkit.org/show_bug.cgi?id=231694
​https://commits.webkit.org/r285432

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/GPUProcess.h (modified) (2 diffs)
• GPUProcess/GPUProcess.messages.in (modified) (1 diff)
• GPUProcess/cocoa/GPUProcessCocoa.mm (modified) (2 diffs)
• GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in (modified) (1 diff)
• Shared/Cocoa/AudioComponentRegistration.cpp (deleted)
• Shared/Cocoa/AudioComponentRegistration.h (deleted)
• UIProcess/Cocoa/WebProcessProxyCocoa.mm (modified) (3 diffs)
• UIProcess/GPU/GPUProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• WebAuthnProcess/mac/com.apple.WebKit.WebAuthnProcess.sb.in (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r285432.
+        https://bugs.webkit.org/show_bug.cgi?id=232864
+
+        Introduced audio capture regression
+
+        Reverted changeset:
+
+        "[macOS][GPUP] Remove access in sandbox to
+        com.apple.audio.AudioComponentRegistrar"
+        https://bugs.webkit.org/show_bug.cgi?id=231694
+        https://commits.webkit.org/r285432
+
 2021-11-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/GPUProcess/GPUProcess.h

@@ -29 +29 @@
 
 #include "AuxiliaryProcess.h"
-#include "DataReference.h"
 #include "SandboxExtension.h"
 #include "WebPageProxyIdentifier.h"
@@ -110 +109 @@
 
     const String& applicationVisibleName() const { return m_applicationVisibleName; }
-
-#if PLATFORM(COCOA)
-    void consumeAudioComponentRegistrations(const IPC::DataReference&);
-#endif
 
     void webProcessConnectionCountForTesting(CompletionHandler<void(uint64_t)>&&);

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

@@ -77 +77 @@
 #endif
 
-#if PLATFORM(COCOA)
-    ConsumeAudioComponentRegistrations(IPC::SharedBufferDataReference registrationData)
-#endif
-
     WebProcessConnectionCountForTesting() -> (uint64_t count) Async
 }

trunk/Source/WebKit/GPUProcess/cocoa/GPUProcessCocoa.mm

@@ -31 +31 @@
 #if ENABLE(GPU_PROCESS) && PLATFORM(COCOA)
 
-#import "AudioComponentRegistration.h"
 #import "GPUConnectionToWebProcess.h"
 #import "RemoteRenderingBackend.h"
@@ -77 +76 @@
 #endif // ENABLE(CFPREFS_DIRECT_MODE)
 
-void GPUProcess::consumeAudioComponentRegistrations(const IPC::DataReference& data)
-{
-    WebKit::consumeAudioComponentRegistrations(data);
-}
-
 } // namespace WebKit
 

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

@@ -688 +688 @@
     (ipc-posix-name-prefix "AudioIO"))
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
 (allow mach-lookup
     (global-name "com.apple.audio.AudioComponentRegistrar"))
-#endif
 
 #if !ENABLE(CFPREFS_DIRECT_MODE)

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

@@ -40 +40 @@
 #import "WebProcessPool.h"
 #import <WebCore/RuntimeApplicationChecks.h>
+#import <WebCore/WebMAudioUtilitiesCocoa.h>
 #import <sys/sysctl.h>
 #import <wtf/NeverDestroyed.h>
@@ -64 +65 @@
 #endif
 
+#import <pal/cf/AudioToolboxSoftLink.h>
+
 namespace WebKit {
 
@@ -287 +290 @@
 #endif
 
+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)
+            return;
+
+        RunLoop::main().dispatch([weakThis = WTFMove(weakThis), registrations = adoptCF(registrations)] () mutable {
+            if (!weakThis)
+                return;
+
+            auto registrationData = WebCore::SharedBuffer::create(registrations.get());
+            weakThis->send(Messages::WebProcess::ConsumeAudioComponentRegistrations({ registrationData }), 0);
+        });
+    });
+}
+
 bool WebProcessProxy::messageSourceIsValidWebContentProcess()
 {

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

@@ -64 +64 @@
 #endif
 
-#if PLATFORM(COCOA)
-#include "AudioComponentRegistration.h"
-#endif
-
 #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, this->connection())
 
@@ -453 +449 @@
         return;
     m_hasSentNetworkProcessXPCEndpoint = store->sendNetworkProcessXPCEndpointToProcess(*this);
-
-    sendAudioComponentRegistrations<Messages::GPUProcess::ConsumeAudioComponentRegistrations>(*this);
 #endif
 }

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -131 +131 @@
 
 #if PLATFORM(COCOA)
-#include "AudioComponentRegistration.h"
 #include "DefaultWebBrowserChecks.h"
 #include <WebCore/GameControllerGamepadProvider.h>
@@ -871 +870 @@
 
 #if PLATFORM(COCOA)
-    sendAudioComponentRegistrations<Messages::WebProcess::ConsumeAudioComponentRegistrations>(process);
+    process.sendAudioComponentRegistrations();
 #endif
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -339 +339 @@
     void grantAudioCaptureExtension() { m_mediaCaptureSandboxExtensions |= Audio; }
     void revokeAudioCaptureExtension() { m_mediaCaptureSandboxExtensions &= ~Audio; }
+
+    void sendAudioComponentRegistrations();
 #endif
 

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

@@ -328 +328 @@
     (with report) (with telemetry)
 #endif
+    (global-name "com.apple.audio.AudioComponentRegistrar")
     (global-name "com.apple.awdd")
 #if !ENABLE(CFPREFS_DIRECT_MODE)

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

@@ -1942 +1942 @@
                 E39628DD23960CC600658ECD /* WebDeviceOrientationUpdateProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = E39628DB23960CC500658ECD /* WebDeviceOrientationUpdateProvider.h */; };
                 E39628DE23960CC600658ECD /* WebDeviceOrientationUpdateProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E39628DC23960CC600658ECD /* WebDeviceOrientationUpdateProvider.cpp */; };
-                E3C2396D2721C9C200E37537 /* AudioComponentRegistration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3C2396B2721C9C100E37537 /* AudioComponentRegistration.cpp */; };
-                E3C2396E2721C9C200E37537 /* AudioComponentRegistration.h in Headers */ = {isa = PBXBuildFile; fileRef = E3C2396C2721C9C200E37537 /* AudioComponentRegistration.h */; };
                 E3CAAA442413279900CED2E2 /* AccessibilitySupportSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E3CAAA432413278A00CED2E2 /* AccessibilitySupportSPI.h */; };
                 E413F59D1AC1ADC400345360 /* NetworkCacheEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */; };
@@ -5863 +5861 @@
                 E3BCE877267252120011D8DB /* AccessibilityPreferences.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityPreferences.cpp; sourceTree = "<group>"; };
                 E3BCE878267252120011D8DB /* AccessibilityPreferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccessibilityPreferences.h; sourceTree = "<group>"; };
-                E3C2396B2721C9C100E37537 /* AudioComponentRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioComponentRegistration.cpp; sourceTree = "<group>"; };
-                E3C2396C2721C9C200E37537 /* AudioComponentRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioComponentRegistration.h; sourceTree = "<group>"; };
                 E3CAAA432413278A00CED2E2 /* AccessibilitySupportSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySupportSPI.h; sourceTree = "<group>"; };
                 E3EFB02C2550617C003C2F96 /* WebSystemSoundDelegate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebSystemSoundDelegate.cpp; sourceTree = "<group>"; };
@@ -8155 +8151 @@
                                 A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */,
                                 A175C44B21AA331B000037D0 /* ArgumentCodersCocoa.mm */,
-                                E3C2396B2721C9C100E37537 /* AudioComponentRegistration.cpp */,
-                                E3C2396C2721C9C200E37537 /* AudioComponentRegistration.h */,
                                 1A698F171E4910220064E881 /* AuxiliaryProcessCocoa.mm */,
                                 CE11AD511CBC482F00681EE5 /* CodeSigning.h */,
@@ -11883 +11877 @@
                                 AAFA634F234F7C6400FFA864 /* AsyncRevalidation.h in Headers */,
                                 BCEE966D112FAF57006BCC24 /* Attachment.h in Headers */,
-                                E3C2396E2721C9C200E37537 /* AudioComponentRegistration.h in Headers */,
                                 512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */,
                                 512F589912A8838800629530 /* AuthenticationDecisionListener.h in Headers */,
@@ -14134 +14127 @@
                                 2DEB1D2E2127473600933906 /* ArgumentCodersCF.cpp in Sources */,
                                 2D92A77C212B6A7100F493FD /* Attachment.cpp in Sources */,
-                                E3C2396D2721C9C200E37537 /* AudioComponentRegistration.cpp in Sources */,
                                 CD4570D424411D0F00A3DCEB /* AudioSessionRoutingArbitrator.cpp in Sources */,
                                 CD4570D3244113B500A3DCEB /* AudioSessionRoutingArbitratorProxyMessageReceiver.cpp in Sources */,