<!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>[280936] trunk/Source/WebKit</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/280936">280936</a></dd>
<dt>Author</dt> <dd>peng.liu6@apple.com</dd>
<dt>Date</dt> <dd>2021-08-11 15:54:12 -0700 (Wed, 11 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BigSur] TestWebKitAPI.AudioRoutingArbitration.Updating fails after <a href="http://trac.webkit.org/projects/webkit/changeset/280726">r280726</a>
https://bugs.webkit.org/show_bug.cgi?id=228966

Reviewed by Eric Carlson.

Add an IPC message `RemoteAudioSessionProxy::SetIsPlayingToBluetoothOverride`
for testing purpose, so that the test `AudioRoutingArbitration.Updating` will
work as expected when "Media in GPU Process" is enabled.

No new tests. Fix an API test failure.

* GPUProcess/media/RemoteAudioSessionProxy.cpp:
(WebKit::RemoteAudioSessionProxy::setCategory):
(WebKit::RemoteAudioSessionProxy::setIsPlayingToBluetoothOverride):
* GPUProcess/media/RemoteAudioSessionProxy.h:
* GPUProcess/media/RemoteAudioSessionProxy.messages.in:
* WebProcess/GPU/media/RemoteAudioSession.cpp:
(WebKit::RemoteAudioSession::setCategory):
(WebKit::RemoteAudioSession::setIsPlayingToBluetoothOverride):
* WebProcess/GPU/media/RemoteAudioSession.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitGPUProcessmediaRemoteAudioSessionProxycpp">trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitGPUProcessmediaRemoteAudioSessionProxyh">trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.h</a></li>
<li><a href="#trunkSourceWebKitGPUProcessmediaRemoteAudioSessionProxymessagesin">trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUmediaRemoteAudioSessioncpp">trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUmediaRemoteAudioSessionh">trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280935 => 280936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-11 22:33:17 UTC (rev 280935)
+++ trunk/Source/WebKit/ChangeLog       2021-08-11 22:54:12 UTC (rev 280936)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-08-11  Peng Liu  <peng.liu6@apple.com>
+
+        [BigSur] TestWebKitAPI.AudioRoutingArbitration.Updating fails after r280726
+        https://bugs.webkit.org/show_bug.cgi?id=228966
+
+        Reviewed by Eric Carlson.
+
+        Add an IPC message `RemoteAudioSessionProxy::SetIsPlayingToBluetoothOverride`
+        for testing purpose, so that the test `AudioRoutingArbitration.Updating` will
+        work as expected when "Media in GPU Process" is enabled.
+
+        No new tests. Fix an API test failure.
+
+        * GPUProcess/media/RemoteAudioSessionProxy.cpp:
+        (WebKit::RemoteAudioSessionProxy::setCategory):
+        (WebKit::RemoteAudioSessionProxy::setIsPlayingToBluetoothOverride):
+        * GPUProcess/media/RemoteAudioSessionProxy.h:
+        * GPUProcess/media/RemoteAudioSessionProxy.messages.in:
+        * WebProcess/GPU/media/RemoteAudioSession.cpp:
+        (WebKit::RemoteAudioSession::setCategory):
+        (WebKit::RemoteAudioSession::setIsPlayingToBluetoothOverride):
+        * WebProcess/GPU/media/RemoteAudioSession.h:
+
</ins><span class="cx"> 2021-08-11  David Kilzer  <ddkilzer@apple.com>
</span><span class="cx"> 
</span><span class="cx">         ThreadSanitizer: data race in WTF::StringImpl::deref() under WebKit::NetworkCache::IOChannel::~IOChannel()
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessmediaRemoteAudioSessionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.cpp (280935 => 280936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.cpp 2021-08-11 22:33:17 UTC (rev 280935)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.cpp    2021-08-11 22:54:12 UTC (rev 280936)
</span><span class="lines">@@ -73,11 +73,12 @@
</span><span class="cx"> 
</span><span class="cx"> void RemoteAudioSessionProxy::setCategory(AudioSession::CategoryType category, RouteSharingPolicy policy)
</span><span class="cx"> {
</span><del>-    if (m_category == category && m_routeSharingPolicy == policy)
</del><ins>+    if (m_category == category && m_routeSharingPolicy == policy && !m_isPlayingToBluetoothOverrideChanged)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_category = category;
</span><span class="cx">     m_routeSharingPolicy = policy;
</span><ins>+    m_isPlayingToBluetoothOverrideChanged = false;
</ins><span class="cx">     audioSessionManager().updateCategory();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -93,6 +94,12 @@
</span><span class="cx">     completion(m_active);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RemoteAudioSessionProxy::setIsPlayingToBluetoothOverride(std::optional<bool>&& value)
+{
+    m_isPlayingToBluetoothOverrideChanged = true;
+    audioSessionManager().session().setIsPlayingToBluetoothOverride(WTFMove(value));
+}
+
</ins><span class="cx"> void RemoteAudioSessionProxy::configurationChanged()
</span><span class="cx"> {
</span><span class="cx">     connection().send(Messages::RemoteAudioSession::ConfigurationChanged(configuration()), { });
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessmediaRemoteAudioSessionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.h (280935 => 280936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.h   2021-08-11 22:33:17 UTC (rev 280935)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.h      2021-08-11 22:54:12 UTC (rev 280936)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">     void setPreferredBufferSize(uint64_t);
</span><span class="cx">     using SetActiveCompletion = CompletionHandler<void(bool)>;
</span><span class="cx">     void tryToSetActive(bool, SetActiveCompletion&&);
</span><ins>+    void setIsPlayingToBluetoothOverride(std::optional<bool>&& value);
</ins><span class="cx"> 
</span><span class="cx">     RemoteAudioSessionProxyManager& audioSessionManager();
</span><span class="cx">     IPC::Connection& connection();
</span><span class="lines">@@ -83,6 +84,7 @@
</span><span class="cx">     WebCore::RouteSharingPolicy m_routeSharingPolicy { WebCore::RouteSharingPolicy::Default };
</span><span class="cx">     size_t m_preferredBufferSize { 0 };
</span><span class="cx">     bool m_active { false };
</span><ins>+    bool m_isPlayingToBluetoothOverrideChanged { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessmediaRemoteAudioSessionProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.messages.in (280935 => 280936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.messages.in 2021-08-11 22:33:17 UTC (rev 280935)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.messages.in    2021-08-11 22:54:12 UTC (rev 280936)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">     SetCategory(enum:uint8_t WebCore::AudioSession::CategoryType type, enum:uint8_t WebCore::RouteSharingPolicy policy)
</span><span class="cx">     SetPreferredBufferSize(uint64_t preferredBufferSize)
</span><span class="cx">     TryToSetActive(bool active) -> (bool suceeded) Synchronous
</span><ins>+    SetIsPlayingToBluetoothOverride(std::optional<bool> value)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUmediaRemoteAudioSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp (280935 => 280936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp  2021-08-11 22:33:17 UTC (rev 280935)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp     2021-08-11 22:54:12 UTC (rev 280936)
</span><span class="lines">@@ -94,11 +94,12 @@
</span><span class="cx"> void RemoteAudioSession::setCategory(CategoryType type, RouteSharingPolicy policy)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-    if (type == m_category && policy == m_routeSharingPolicy)
</del><ins>+    if (type == m_category && policy == m_routeSharingPolicy && !m_isPlayingToBluetoothOverrideChanged)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_category = type;
</span><span class="cx">     m_routeSharingPolicy = policy;
</span><ins>+    m_isPlayingToBluetoothOverrideChanged = false;
</ins><span class="cx"> 
</span><span class="cx">     ensureConnection().send(Messages::RemoteAudioSessionProxy::SetCategory(type, policy), { });
</span><span class="cx"> #else
</span><span class="lines">@@ -132,6 +133,14 @@
</span><span class="cx">     m_configurationChangeObservers.remove(observer);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if ENABLE(ROUTING_ARBITRATION)
+void RemoteAudioSession::setIsPlayingToBluetoothOverride(std::optional<bool> value)
+{
+    m_isPlayingToBluetoothOverrideChanged = true;
+    ensureConnection().send(Messages::RemoteAudioSessionProxy::SetIsPlayingToBluetoothOverride(value), { });
+}
+#endif
+
</ins><span class="cx"> AudioSession::CategoryType RemoteAudioSession::category() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUmediaRemoteAudioSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.h (280935 => 280936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.h    2021-08-11 22:33:17 UTC (rev 280935)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.h       2021-08-11 22:54:12 UTC (rev 280936)
</span><span class="lines">@@ -71,6 +71,10 @@
</span><span class="cx">     void addConfigurationChangeObserver(ConfigurationChangeObserver&);
</span><span class="cx">     void removeConfigurationChangeObserver(ConfigurationChangeObserver&);
</span><span class="cx"> 
</span><ins>+#if ENABLE(ROUTING_ARBITRATION)
+    void setIsPlayingToBluetoothOverride(std::optional<bool>) final;
+#endif
+
</ins><span class="cx">     const RemoteAudioSessionConfiguration& configuration() const;
</span><span class="cx">     RemoteAudioSessionConfiguration& configuration();
</span><span class="cx">     void initializeConfigurationIfNecessary();
</span><span class="lines">@@ -91,6 +95,7 @@
</span><span class="cx">     WeakHashSet<ConfigurationChangeObserver> m_configurationChangeObservers;
</span><span class="cx">     CategoryType m_category { CategoryType::None };
</span><span class="cx">     WebCore::RouteSharingPolicy m_routeSharingPolicy { WebCore::RouteSharingPolicy::Default };
</span><ins>+    bool m_isPlayingToBluetoothOverrideChanged { false };
</ins><span class="cx">     std::optional<RemoteAudioSessionConfiguration> m_configuration;
</span><span class="cx">     WeakPtr<GPUProcessConnection> m_gpuProcessConnection;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>