Title: [228075] branches/safari-605-branch/Source/WebCore
- Revision
- 228075
- Author
- jmarc...@apple.com
- Date
- 2018-02-04 21:30:48 -0800 (Sun, 04 Feb 2018)
Log Message
Cherry-pick r228034. rdar://problem/37220140
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228074 => 228075)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-05 05:30:46 UTC (rev 228074)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-05 05:30:48 UTC (rev 228075)
@@ -1,5 +1,20 @@
2018-02-04 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r228034. rdar://problem/37220140
+
+ 2018-02-02 Youenn Fablet <you...@apple.com>
+
+ Clearing all service worker registrations should wait for importing service worker registration to finish
+ https://bugs.webkit.org/show_bug.cgi?id=182407
+ <rdar://problem/37167523>
+
+ Reviewed by Chris Dumez.
+
+ * workers/service/server/SWServer.cpp:
+ (WebCore::SWServer::clear): ensure completion handler is called on early exit case.
+
+2018-02-04 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r228025. rdar://problem/37220140
2018-02-02 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/workers/service/server/SWServer.cpp (228074 => 228075)
--- branches/safari-605-branch/Source/WebCore/workers/service/server/SWServer.cpp 2018-02-05 05:30:46 UTC (rev 228074)
+++ branches/safari-605-branch/Source/WebCore/workers/service/server/SWServer.cpp 2018-02-05 05:30:48 UTC (rev 228075)
@@ -230,8 +230,10 @@
return contextData.registration.key.relatesToOrigin(origin);
});
- if (registrationsToRemove.isEmpty())
+ if (registrationsToRemove.isEmpty()) {
+ completionHandler();
return;
+ }
// Calling SWServerRegistration::clear() takes care of updating m_registrations, m_originStore and m_registrationStore.
for (auto* registration : registrationsToRemove)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
