Title: [292988] branches/safari-613-branch
- Revision
- 292988
- Author
- alanc...@apple.com
- Date
- 2022-04-18 17:49:35 -0700 (Mon, 18 Apr 2022)
Log Message
Cherry-pick r292401. rdar://problem/83168970
5 Media API tests are flakily timing out on iOS14
https://bugs.webkit.org/show_bug.cgi?id=230321
<rdar://problem/83168970>
Reviewed by Jer Noble.
Source/WebKit:
Un-skipped API test WKWebViewPausePlayingAudioTests.OutOfWindow
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::applicationWillEnterForegroundForMedia): Log the correct name.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::applicationDidEnterBackgroundForMedia): Call PlatformMediaSessionManager.
(WebKit::WebPage::applicationWillEnterForegroundForMedia): Ditto.
Tools:
* TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm:
(TestWebKitAPI::TEST):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (292987 => 292988)
--- branches/safari-613-branch/Source/WebKit/ChangeLog 2022-04-19 00:49:31 UTC (rev 292987)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog 2022-04-19 00:49:35 UTC (rev 292988)
@@ -1,5 +1,51 @@
2022-04-18 Kocsen Chung <kocsen_ch...@apple.com>
+ Cherry-pick r292401. rdar://problem/83168970
+
+ 5 Media API tests are flakily timing out on iOS14
+ https://bugs.webkit.org/show_bug.cgi?id=230321
+ <rdar://problem/83168970>
+
+ Reviewed by Jer Noble.
+
+ Source/WebKit:
+
+ Un-skipped API test WKWebViewPausePlayingAudioTests.OutOfWindow
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationWillEnterForegroundForMedia): Log the correct name.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationDidEnterBackgroundForMedia): Call PlatformMediaSessionManager.
+ (WebKit::WebPage::applicationWillEnterForegroundForMedia): Ditto.
+
+ Tools:
+
+ * TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm:
+ (TestWebKitAPI::TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-05 Eric Carlson <eric.carl...@apple.com>
+
+ 5 Media API tests are flakily timing out on iOS14
+ https://bugs.webkit.org/show_bug.cgi?id=230321
+ <rdar://problem/83168970>
+
+ Reviewed by Jer Noble.
+
+ Un-skipped API test WKWebViewPausePlayingAudioTests.OutOfWindow
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationWillEnterForegroundForMedia): Log the correct name.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationDidEnterBackgroundForMedia): Call PlatformMediaSessionManager.
+ (WebKit::WebPage::applicationWillEnterForegroundForMedia): Ditto.
+
+2022-04-18 Kocsen Chung <kocsen_ch...@apple.com>
+
Cherry-pick r292319. rdar://problem/89916360
Remove display list map entry before remote resource
Modified: branches/safari-613-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (292987 => 292988)
--- branches/safari-613-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2022-04-19 00:49:31 UTC (rev 292987)
+++ branches/safari-613-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2022-04-19 00:49:35 UTC (rev 292988)
@@ -637,7 +637,7 @@
void WebPageProxy::applicationWillEnterForegroundForMedia()
{
bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
- WEBPAGEPROXY_RELEASE_LOG(ViewState, "applicationDidEnterBackgroundForMedia: isSuspendedUnderLock? %d", isSuspendedUnderLock);
+ WEBPAGEPROXY_RELEASE_LOG(ViewState, "applicationWillEnterForegroundForMedia: isSuspendedUnderLock? %d", isSuspendedUnderLock);
m_process->send(Messages::WebPage::ApplicationWillEnterForegroundForMedia(isSuspendedUnderLock), m_webPageID);
}
Modified: branches/safari-613-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (292987 => 292988)
--- branches/safari-613-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2022-04-19 00:49:31 UTC (rev 292987)
+++ branches/safari-613-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2022-04-19 00:49:35 UTC (rev 292988)
@@ -3957,12 +3957,14 @@
void WebPage::applicationDidEnterBackgroundForMedia(bool isSuspendedUnderLock)
{
- [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationDidEnterBackgroundNotification object:nil userInfo:@{@"isSuspendedUnderLock": @(isSuspendedUnderLock)}];
+ if (auto* manager = PlatformMediaSessionManager::sharedManagerIfExists())
+ manager->applicationDidEnterBackground(isSuspendedUnderLock);
}
void WebPage::applicationWillEnterForegroundForMedia(bool isSuspendedUnderLock)
{
- [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationWillEnterForegroundNotification object:nil userInfo:@{@"isSuspendedUnderLock": @(isSuspendedUnderLock)}];
+ if (auto* manager = PlatformMediaSessionManager::sharedManagerIfExists())
+ manager->applicationWillEnterForeground(isSuspendedUnderLock);
}
static inline void adjustVelocityDataForBoundedScale(VelocityData& velocityData, double exposedRectScale, double minimumScale, double maximumScale)
Modified: branches/safari-613-branch/Tools/ChangeLog (292987 => 292988)
--- branches/safari-613-branch/Tools/ChangeLog 2022-04-19 00:49:31 UTC (rev 292987)
+++ branches/safari-613-branch/Tools/ChangeLog 2022-04-19 00:49:35 UTC (rev 292988)
@@ -1,3 +1,43 @@
+2022-04-18 Kocsen Chung <kocsen_ch...@apple.com>
+
+ Cherry-pick r292401. rdar://problem/83168970
+
+ 5 Media API tests are flakily timing out on iOS14
+ https://bugs.webkit.org/show_bug.cgi?id=230321
+ <rdar://problem/83168970>
+
+ Reviewed by Jer Noble.
+
+ Source/WebKit:
+
+ Un-skipped API test WKWebViewPausePlayingAudioTests.OutOfWindow
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationWillEnterForegroundForMedia): Log the correct name.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationDidEnterBackgroundForMedia): Call PlatformMediaSessionManager.
+ (WebKit::WebPage::applicationWillEnterForegroundForMedia): Ditto.
+
+ Tools:
+
+ * TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm:
+ (TestWebKitAPI::TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-05 Eric Carlson <eric.carl...@apple.com>
+
+ 5 Media API tests are flakily timing out on iOS14
+ https://bugs.webkit.org/show_bug.cgi?id=230321
+ <rdar://problem/83168970>
+
+ Reviewed by Jer Noble.
+
+ * TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm:
+ (TestWebKitAPI::TEST):
+
2022-04-13 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r292721. rdar://problem/88249235
Modified: branches/safari-613-branch/Tools/TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm (292987 => 292988)
--- branches/safari-613-branch/Tools/TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm 2022-04-19 00:49:31 UTC (rev 292987)
+++ branches/safari-613-branch/Tools/TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm 2022-04-19 00:49:35 UTC (rev 292988)
@@ -69,8 +69,6 @@
Util::run(&isPlaying);
}
-// FIXME: Re-enable this test once webkit.org/b/230321 is resolved.
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000
TEST(WKWebViewPausePlayingAudioTests, OutOfWindow)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:autoplayingConfiguration().get() addToWindow:YES]);
@@ -104,7 +102,6 @@
Util::run(&isPlaying);
}
-#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
