<!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>[245156] trunk</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/245156">245156</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2019-05-09 13:32:55 -0700 (Thu, 09 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Refine AudioSession route sharing policy
https://bugs.webkit.org/show_bug.cgi?id=197742
<rdar://problem/50590818>

Reviewed by Darin Adler.

Source/WebCore:

No new tests, updated AVAudioSessionRouteSharingPolicy API test.

* platform/audio/cocoa/MediaSessionManagerCocoa.mm:
(MediaSessionManagerCocoa::updateSessionState):

Tools:

* TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiococoaMediaSessionManagerCocoamm">trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitLegacyiosAudioSessionCategoryIOSmm">trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (245155 => 245156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-09 20:27:21 UTC (rev 245155)
+++ trunk/Source/WebCore/ChangeLog      2019-05-09 20:32:55 UTC (rev 245156)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-05-09  Eric Carlson  <eric.carlson@apple.com>
+
+        Refine AudioSession route sharing policy
+        https://bugs.webkit.org/show_bug.cgi?id=197742
+        <rdar://problem/50590818>
+
+        Reviewed by Darin Adler.
+
+        No new tests, updated AVAudioSessionRouteSharingPolicy API test.
+
+        * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+        (MediaSessionManagerCocoa::updateSessionState):
+
</ins><span class="cx"> 2019-05-09  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         fast/hidpi/video-controls-in-hidpi.html sometimes asserts in WK1
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiococoaMediaSessionManagerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm (245155 => 245156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm    2019-05-09 20:27:21 UTC (rev 245155)
+++ trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm       2019-05-09 20:32:55 UTC (rev 245156)
</span><span class="lines">@@ -111,10 +111,7 @@
</span><span class="cx">         category = AudioSession::PlayAndRecord;
</span><span class="cx">     else if (hasAudibleAudioOrVideoMediaType) {
</span><span class="cx">         category = AudioSession::MediaPlayback;
</span><del>-        if (videoCount || videoAudioCount)
-            policy = RouteSharingPolicy::LongFormVideo;
-        else
-            policy = RouteSharingPolicy::LongFormAudio;
</del><ins>+        policy = RouteSharingPolicy::LongFormAudio;
</ins><span class="cx">     } else if (webAudioCount)
</span><span class="cx">         category = AudioSession::AmbientSound;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (245155 => 245156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-09 20:27:21 UTC (rev 245155)
+++ trunk/Tools/ChangeLog       2019-05-09 20:32:55 UTC (rev 245156)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-05-09  Eric Carlson  <eric.carlson@apple.com>
+
+        Refine AudioSession route sharing policy
+        https://bugs.webkit.org/show_bug.cgi?id=197742
+        <rdar://problem/50590818>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm:
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2019-05-09  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Remove unnecessary test SPI after r244883
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitLegacyiosAudioSessionCategoryIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm (245155 => 245156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm      2019-05-09 20:27:21 UTC (rev 245155)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm 2019-05-09 20:32:55 UTC (rev 245156)
</span><span class="lines">@@ -71,15 +71,6 @@
</span><span class="cx">     } while (++tries <= 100);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static AVAudioSessionRouteSharingPolicy routeSharingPolicyLongFormVideo()
-{
-#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
-    return AVAudioSessionRouteSharingPolicyLongFormVideo;
-#else
-    return AVAudioSessionRouteSharingPolicyLongForm;
-#endif
-}
-
</del><span class="cx"> static AVAudioSessionRouteSharingPolicy routeSharingPolicyLongFormAudio()
</span><span class="cx"> {
</span><span class="cx"> #if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
</span><span class="lines">@@ -110,7 +101,10 @@
</span><span class="cx"> 
</span><span class="cx">     waitUntilAudioSessionCategoryIsEqualTo(getAVAudioSessionCategoryPlayback());
</span><span class="cx">     EXPECT_WK_STREQ(getAVAudioSessionCategoryPlayback(), [[getAVAudioSessionClass() sharedInstance] category]);
</span><del>-    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
</del><ins>+    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormAudio());
+#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
+    EXPECT_NE([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], AVAudioSessionRouteSharingPolicyLongFormVideo);
+#endif
</ins><span class="cx"> 
</span><span class="cx">     didBeginPlaying = false;
</span><span class="cx"> 
</span><span class="lines">@@ -150,7 +144,10 @@
</span><span class="cx"> 
</span><span class="cx">     waitUntilAudioSessionCategoryIsEqualTo(getAVAudioSessionCategoryPlayback());
</span><span class="cx">     EXPECT_WK_STREQ(getAVAudioSessionCategoryPlayback(), [[getAVAudioSessionClass() sharedInstance] category]);
</span><del>-    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
</del><ins>+    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormAudio());
+#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
+    EXPECT_NE([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], AVAudioSessionRouteSharingPolicyLongFormVideo);
+#endif
</ins><span class="cx"> 
</span><span class="cx">     didBeginPlaying = false;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>