Title: [245996] branches/safari-608.1.27-branch/Source/WebKit
- Revision
- 245996
- Author
- alanc...@apple.com
- Date
- 2019-05-31 16:24:59 -0700 (Fri, 31 May 2019)
Log Message
Revert r245899. rdar://problem/51316898
Modified Paths
Diff
Modified: branches/safari-608.1.27-branch/Source/WebKit/ChangeLog (245995 => 245996)
--- branches/safari-608.1.27-branch/Source/WebKit/ChangeLog 2019-05-31 23:22:31 UTC (rev 245995)
+++ branches/safari-608.1.27-branch/Source/WebKit/ChangeLog 2019-05-31 23:24:59 UTC (rev 245996)
@@ -1,3 +1,7 @@
+2019-05-31 Alan Coon <alanc...@apple.com>
+
+ Revert r245899. rdar://problem/51316898
+
2019-05-31 Kocsen Chung <kocsen_ch...@apple.com>
Revert r245953. rdar://problem/51314019
Modified: branches/safari-608.1.27-branch/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm (245995 => 245996)
--- branches/safari-608.1.27-branch/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm 2019-05-31 23:22:31 UTC (rev 245995)
+++ branches/safari-608.1.27-branch/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm 2019-05-31 23:24:59 UTC (rev 245996)
@@ -150,17 +150,7 @@
}
RELEASE_LOG(ProcessSuspension, "%p - WKProcessAssertionBackgroundTaskManager - beginBackgroundTaskWithName", self);
_backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"com.apple.WebKit.ProcessAssertion" expirationHandler:^{
- RELEASE_LOG_ERROR(ProcessSuspension, "Background task expired while holding WebKit ProcessAssertion (isMainThread? %d, applicationIsBackgrounded? %d).", RunLoop::isMain(), _applicationIsBackgrounded);
- if (!_applicationIsBackgrounded) {
- // We've received the invalidation warning after the app has become foreground again. In this case, we should not warn clients of imminent suspension.
- // To be safe (avoid potential killing), we end the task right away and call _updateBackgroundTask asynchronously to start a new task if necessary.
- [self _cancelPendingReleaseTask];
- [self _releaseBackgroundTask];
- dispatch_async(dispatch_get_main_queue(), ^{
- [self _updateBackgroundTask];
- });
- return;
- }
+ RELEASE_LOG_ERROR(ProcessSuspension, "Background task expired while holding WebKit ProcessAssertion (isMainThread? %d).", RunLoop::isMain());
// The expiration handler gets called on a non-main thread when the underlying assertion could not be taken (rdar://problem/27278419).
if (RunLoop::isMain())
[self _notifyAssertionsOfImminentSuspension];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
