Title: [283205] branches/safari-612-branch/Source
- Revision
- 283205
- Author
- alanc...@apple.com
- Date
- 2021-09-28 17:26:58 -0700 (Tue, 28 Sep 2021)
Log Message
Cherry-pick r283156. rdar://problem/83648190
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
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WTF/ChangeLog (283204 => 283205)
--- branches/safari-612-branch/Source/WTF/ChangeLog 2021-09-29 00:26:36 UTC (rev 283204)
+++ branches/safari-612-branch/Source/WTF/ChangeLog 2021-09-29 00:26:58 UTC (rev 283205)
@@ -1,3 +1,39 @@
+2021-09-28 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r283156. rdar://problem/83648190
+
+ 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
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-27 Jean-Yves Avenard <j...@apple.com>
+
+ 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-23 Russell Epstein <repst...@apple.com>
Cherry-pick r281910. rdar://problem/83429926
Modified: branches/safari-612-branch/Source/WTF/wtf/PlatformUse.h (283204 => 283205)
--- branches/safari-612-branch/Source/WTF/wtf/PlatformUse.h 2021-09-29 00:26:36 UTC (rev 283204)
+++ branches/safari-612-branch/Source/WTF/wtf/PlatformUse.h 2021-09-29 00:26:58 UTC (rev 283205)
@@ -347,3 +347,6 @@
#endif
#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
+#define USE_VORBIS_AUDIOCOMPONENT_WORKAROUND 1
+#endif
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (283204 => 283205)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-29 00:26:36 UTC (rev 283204)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-29 00:26:58 UTC (rev 283205)
@@ -1,3 +1,44 @@
+2021-09-28 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r283156. rdar://problem/83648190
+
+ 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
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-27 Jean-Yves Avenard <j...@apple.com>
+
+ 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 Alan Coon <alanc...@apple.com>
Cherry-pick r283081. rdar://problem/83584464
Modified: branches/safari-612-branch/Source/WebKit/Scripts/process-entitlements.sh (283204 => 283205)
--- branches/safari-612-branch/Source/WebKit/Scripts/process-entitlements.sh 2021-09-29 00:26:36 UTC (rev 283204)
+++ branches/safari-612-branch/Source/WebKit/Scripts/process-entitlements.sh 2021-09-29 00:26:58 UTC (rev 283205)
@@ -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: branches/safari-612-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (283204 => 283205)
--- branches/safari-612-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-09-29 00:26:36 UTC (rev 283204)
+++ branches/safari-612-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-09-29 00:26:58 UTC (rev 283205)
@@ -704,8 +704,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
