<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283156] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283156">283156</a></dd>
<dt>Author</dt> <dd>jya@apple.com</dd>
<dt>Date</dt> <dd>2021-09-27 17:49:06 -0700 (Mon, 27 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformUseh">trunk/Source/WTF/wtf/PlatformUse.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitScriptsprocessentitlementssh">trunk/Source/WebKit/Scripts/process-entitlements.sh</a></li>
<li><a href="#trunkSourceWebKitWebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (283155 => 283156)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-09-27  Jean-Yves Avenard  <jya@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
+
</ins><span class="cx"> 2021-09-27  Saam Barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Build an unlinked baseline JIT
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformUseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformUse.h (283155 => 283156)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -357,3 +357,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
+#define USE_VORBIS_AUDIOCOMPONENT_WORKAROUND 1
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (283155 => 283156)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-09-27  Jean-Yves Avenard  <jya@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.
+
</ins><span class="cx"> 2021-09-27  Per Arne  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS][GPUP] Remove access to unused mach services in sandbox
</span></span></pre></div>
<a id="trunkSourceWebKitScriptsprocessentitlementssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (283155 => 283156)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,6 +27,10 @@
</span><span class="cx">             plistbuddy Add :com.apple.avfoundation.allow-system-wide-context bool YES
</span><span class="cx">             plistbuddy add :com.apple.QuartzCore.webkit-limited-types bool YES
</span><span class="cx">         fi
</span><ins>+        if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 120000 ))
+        then
+            plistbuddy add :com.apple.coreaudio.allow-vorbis-decode YES
+        fi
</ins><span class="cx">     fi
</span><span class="cx"> 
</span><span class="cx">     mac_process_webcontent_or_plugin_entitlements
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (283155 => 283156)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -695,8 +695,10 @@
</span><span class="cx">     // Need to override the default, because service has a different bundle ID.
</span><span class="cx">     auto webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
</span><span class="cx"> 
</span><ins>+#if defined(USE_VORBIS_AUDIOCOMPONENT_WORKAROUND)
</ins><span class="cx">     // We need to initialize the Vorbis decoder before the sandbox gets setup; this is a one off action.
</span><span class="cx">     WebCore::registerVorbisDecoderIfNeeded();
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     sandboxParameters.setOverrideSandboxProfilePath(makeString(String([webKitBundle resourcePath]), "/com.apple.WebProcess.sb"));
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>