Attachment 369502 Details for Bug 197742 – Patch

[patch] Patch

bug-197742-20190509114206.patch (text/plain), 4.07 KB, created by Eric Carlson on 2019-05-09 11:42:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-05-09 11:42:07 PDT

Size: 4.07 KB

patch

obsolete

>Subversion Revision: 245127
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 31d3917a0b6ecff2955871d24d4162e119dbb344..89a2f8c00c31e5c18097c0a64da4ab606320a585 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+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):
>+
> 2019-05-09  Antti Koivisto  <antti@apple.com>
> 
>         Elements with "display: inline-block" don't have a touch-action region
>diff --git a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
>index 04d42c1e57730e7794bfa175a6ff2e23d467e053..374d4cbb8200d309061584fd6a6d6021b75cb522 100644
>--- a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
>+++ b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
>@@ -111,10 +111,7 @@ void MediaSessionManagerCocoa::updateSessionState()
>         category = AudioSession::PlayAndRecord;
>     else if (hasAudibleAudioOrVideoMediaType) {
>         category = AudioSession::MediaPlayback;
>-        if (videoCount || videoAudioCount)
>-            policy = RouteSharingPolicy::LongFormVideo;
>-        else
>-            policy = RouteSharingPolicy::LongFormAudio;
>+        policy = RouteSharingPolicy::LongFormAudio;
>     } else if (webAudioCount)
>         category = AudioSession::AmbientSound;
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e6a5cc06890b29d349bac237f42b7c3c8e46a9ad..71bca4c48cf5dc79e049be1d7b6d64c9380928c8 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+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):
>+
> 2019-05-09  Xan LÃ³pez  <xan@igalia.com>
> 
>         [CMake] Detect SSE2 at compile time
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm b/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm
>index 7ce46eae9bec4d1ff9dbfce6d81188959941573a..7b2cbcbe2202160abffb92aff6ebe53ecd8ef23d 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm
>@@ -110,7 +110,10 @@ TEST(WebKitLegacy, AudioSessionCategoryIOS)
> 
>     waitUntilAudioSessionCategoryIsEqualTo(getAVAudioSessionCategoryPlayback());
>     EXPECT_WK_STREQ(getAVAudioSessionCategoryPlayback(), [[getAVAudioSessionClass() sharedInstance] category]);
>-    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
>+    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormAudio());
>+#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
>+    EXPECT_NE([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
>+#endif
> 
>     didBeginPlaying = false;
> 
>@@ -150,7 +153,10 @@ TEST(WebKitLegacy, AudioSessionCategoryIOS)
> 
>     waitUntilAudioSessionCategoryIsEqualTo(getAVAudioSessionCategoryPlayback());
>     EXPECT_WK_STREQ(getAVAudioSessionCategoryPlayback(), [[getAVAudioSessionClass() sharedInstance] category]);
>-    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
>+    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormAudio());
>+#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
>+    EXPECT_NE([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
>+#endif
> 
>     didBeginPlaying = false;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197742: 369495 | 369501 | 369502 | 369508