- Revision
- 295571
- Author
- pvol...@apple.com
- Date
- 2022-06-15 13:44:22 -0700 (Wed, 15 Jun 2022)
Log Message
Rename file
https://bugs.webkit.org/show_bug.cgi?id=241644
Unreviewed, rename incorrectly named file AuxiliaryProcessProcyCocoa.mm.
* Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm: Renamed from Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm.
(WebKit::AuxiliaryProcessProxy::fetchAudioComponentServerRegistrations):
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
Canonical link: https://commits.webkit.org/251576@main
Modified Paths
Added Paths
Removed Paths
Diff
Deleted: trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm (295570 => 295571)
--- trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm 2022-06-15 20:20:53 UTC (rev 295570)
+++ trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm 2022-06-15 20:44:22 UTC (rev 295571)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2022 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "AuxiliaryProcessProxy.h"
-
-#if PLATFORM(COCOA)
-
-#import <WebCore/WebMAudioUtilitiesCocoa.h>
-#import <pal/cf/AudioToolboxSoftLink.h>
-
-namespace WebKit {
-
-#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
-RefPtr<WebCore::SharedBuffer> AuxiliaryProcessProxy::fetchAudioComponentServerRegistrations()
-{
- using namespace PAL;
-
- CFDataRef registrations { nullptr };
-
- if (!PAL::isAudioToolboxCoreFrameworkAvailable() || !PAL::canLoad_AudioToolboxCore_AudioComponentFetchServerRegistrations())
- return nullptr;
-
- WebCore::registerOpusDecoderIfNeeded();
- WebCore::registerVorbisDecoderIfNeeded();
-
- if (noErr != AudioComponentFetchServerRegistrations(®istrations) || !registrations)
- return nullptr;
-
- return WebCore::SharedBuffer::create(registrations);
-}
-#endif
-
-} // namespace WebKit
-
-#endif // PLATFORM(COCOA)
Copied: trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm (from rev 295570, trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProcyCocoa.mm) (0 => 295571)
--- trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm (rev 0)
+++ trunk/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm 2022-06-15 20:44:22 UTC (rev 295571)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "AuxiliaryProcessProxy.h"
+
+#if PLATFORM(COCOA)
+
+#import <WebCore/WebMAudioUtilitiesCocoa.h>
+#import <pal/cf/AudioToolboxSoftLink.h>
+
+namespace WebKit {
+
+#if HAVE(AUDIO_COMPONENT_SERVER_REGISTRATIONS)
+RefPtr<WebCore::SharedBuffer> AuxiliaryProcessProxy::fetchAudioComponentServerRegistrations()
+{
+ using namespace PAL;
+
+ CFDataRef registrations { nullptr };
+
+ if (!PAL::isAudioToolboxCoreFrameworkAvailable() || !PAL::canLoad_AudioToolboxCore_AudioComponentFetchServerRegistrations())
+ return nullptr;
+
+ WebCore::registerOpusDecoderIfNeeded();
+ WebCore::registerVorbisDecoderIfNeeded();
+
+ if (noErr != AudioComponentFetchServerRegistrations(®istrations) || !registrations)
+ return nullptr;
+
+ return WebCore::SharedBuffer::create(registrations);
+}
+#endif
+
+} // namespace WebKit
+
+#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295570 => 295571)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-15 20:20:53 UTC (rev 295570)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-15 20:44:22 UTC (rev 295571)
@@ -2245,7 +2245,7 @@
E1D26A53175964D90095BFD1 /* WebContentProcess.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */; };
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 */; };
+ E326E357284E580E00157372 /* AuxiliaryProcessProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = E326E356284E580E00157372 /* AuxiliaryProcessProxyCocoa.mm */; };
E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = E36FF00127F36FBD004BE21A /* SandboxStateVariables.h */; };
E36FF00427F36FBD004BE21A /* preferences.sb in Resources */ = {isa = PBXBuildFile; fileRef = E36FF00227F36FBD004BE21A /* preferences.sb */; };
E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3816B3B27E24639005EAFC0 /* WebMockContentFilterManager.cpp */; };
@@ -7020,7 +7020,7 @@
E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; };
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>"; };
+ E326E356284E580E00157372 /* AuxiliaryProcessProxyCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AuxiliaryProcessProxyCocoa.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; };
E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -8147,6 +8147,7 @@
99C81D561C20DFBE005C4C82 /* AutomationClient.mm */,
990D28B71C6539A000986977 /* AutomationSessionClient.h */,
990D28B81C6539A000986977 /* AutomationSessionClient.mm */,
+ E326E356284E580E00157372 /* AuxiliaryProcessProxyCocoa.mm */,
49DC1DE027E5129000C1CB36 /* CSPExtensionUtilities.h */,
49DC1DDF27E5128F00C1CB36 /* CSPExtensionUtilities.mm */,
83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */,
@@ -8231,7 +8232,6 @@
2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */,
2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */,
C1710CF224A7BD0300D7C112 /* XPCEventHandler.h */,
- E326E356284E580E00157372 /* AuxiliaryProcessProcyCocoa.mm */,
);
path = Cocoa;
sourceTree = "<group>";
@@ -16714,6 +16714,7 @@
99249AD51F1F1E5600B62FBB /* AutomationFrontendDispatchers.cpp in Sources */,
9955A6F61C7986E300EB6A93 /* AutomationProtocolObjects.cpp in Sources */,
51FAEC3B1B0657680009C4E7 /* AuxiliaryProcessMessageReceiver.cpp in Sources */,
+ E326E357284E580E00157372 /* AuxiliaryProcessProxyCocoa.mm in Sources */,
517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */,
BCE579A72634836700F5C5E9 /* CGDisplayListImageBufferBackend.cpp in Sources */,
49DC1DE127E5129100C1CB36 /* CSPExtensionUtilities.mm in Sources */,
@@ -16825,7 +16826,6 @@
2D11B7612126A282006F8878 /* UnifiedSource9-mm.mm in Sources */,
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 */,
2D11B7662126A282006F8878 /* UnifiedSource11.cpp in Sources */,
