Title: [283156] trunk/Source
Revision
283156
Author
[email protected]
Date
2021-09-27 17:49:06 -0700 (Mon, 27 Sep 2021)

Log Message

Vorbis decoder can't be instantiated - Remove workaround added in bug 228139
https://bugs.webkit.org/show_bug.cgi?id=230742
rdar://83484414

Reviewed by Eric Carlson.

Source/WebKit:

This is already covered by test; however this will fail on Monterey without the updated
CoreMedia framework.

* Scripts/process-entitlements.sh: Add new required entitlement.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::initializeSandbox): Only have bug workaround on BigSur and earlier.

Source/WTF:

* wtf/PlatformUse.h: Add USE_VORBIS_AUDIOCOMPONENT_WORKAROUND

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (283155 => 283156)


--- trunk/Source/WTF/ChangeLog	2021-09-28 00:16:09 UTC (rev 283155)
+++ trunk/Source/WTF/ChangeLog	2021-09-28 00:49:06 UTC (rev 283156)
@@ -1,3 +1,13 @@
+2021-09-27  Jean-Yves Avenard  <[email protected]>
+
+        Vorbis decoder can't be instantiated - Remove workaround added in bug 228139
+        https://bugs.webkit.org/show_bug.cgi?id=230742
+        rdar://83484414
+
+        Reviewed by Eric Carlson.
+
+        * wtf/PlatformUse.h: Add USE_VORBIS_AUDIOCOMPONENT_WORKAROUND
+
 2021-09-27  Saam Barati  <[email protected]>
 
         Build an unlinked baseline JIT

Modified: trunk/Source/WTF/wtf/PlatformUse.h (283155 => 283156)


--- trunk/Source/WTF/wtf/PlatformUse.h	2021-09-28 00:16:09 UTC (rev 283155)
+++ trunk/Source/WTF/wtf/PlatformUse.h	2021-09-28 00:49:06 UTC (rev 283156)
@@ -357,3 +357,6 @@
 #endif
 #endif
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
+#define USE_VORBIS_AUDIOCOMPONENT_WORKAROUND 1
+#endif

Modified: trunk/Source/WebKit/ChangeLog (283155 => 283156)


--- trunk/Source/WebKit/ChangeLog	2021-09-28 00:16:09 UTC (rev 283155)
+++ trunk/Source/WebKit/ChangeLog	2021-09-28 00:49:06 UTC (rev 283156)
@@ -1,3 +1,18 @@
+2021-09-27  Jean-Yves Avenard  <[email protected]>
+
+        Vorbis decoder can't be instantiated - Remove workaround added in bug 228139
+        https://bugs.webkit.org/show_bug.cgi?id=230742
+        rdar://83484414
+
+        Reviewed by Eric Carlson.
+
+        This is already covered by test; however this will fail on Monterey without the updated
+        CoreMedia framework.
+
+        * Scripts/process-entitlements.sh: Add new required entitlement.
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::initializeSandbox): Only have bug workaround on BigSur and earlier.
+
 2021-09-27  Per Arne  <[email protected]>
 
         [iOS][GPUP] Remove access to unused mach services in sandbox

Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (283155 => 283156)


--- trunk/Source/WebKit/Scripts/process-entitlements.sh	2021-09-28 00:16:09 UTC (rev 283155)
+++ trunk/Source/WebKit/Scripts/process-entitlements.sh	2021-09-28 00:49:06 UTC (rev 283156)
@@ -27,6 +27,10 @@
             plistbuddy Add :com.apple.avfoundation.allow-system-wide-context bool YES
             plistbuddy add :com.apple.QuartzCore.webkit-limited-types bool YES
         fi
+        if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 120000 ))
+        then
+            plistbuddy add :com.apple.coreaudio.allow-vorbis-decode YES
+        fi
     fi
 
     mac_process_webcontent_or_plugin_entitlements

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (283155 => 283156)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-09-28 00:16:09 UTC (rev 283155)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-09-28 00:49:06 UTC (rev 283156)
@@ -695,8 +695,10 @@
     // Need to override the default, because service has a different bundle ID.
     auto webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
 
+#if defined(USE_VORBIS_AUDIOCOMPONENT_WORKAROUND)
     // We need to initialize the Vorbis decoder before the sandbox gets setup; this is a one off action.
     WebCore::registerVorbisDecoderIfNeeded();
+#endif
 
     sandboxParameters.setOverrideSandboxProfilePath(makeString(String([webKitBundle resourcePath]), "/com.apple.WebProcess.sb"));
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to