Changeset 228075 in webkit

Timestamp:

Feb 4, 2018 9:30:48 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r228034. rdar://problem/37220140

Location:

branches/safari-605-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/SWServer.cpp (modified) (1 diff)

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228034. rdar://problem/37220140
+
+    2018-02-02  Youenn Fablet  <youenn@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  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/workers/service/server/SWServer.cpp

@@ -231 +231 @@
     });
 
-    if (registrationsToRemove.isEmpty())
-        return;
+    if (registrationsToRemove.isEmpty()) {
+        completionHandler();
+        return;
+    }
 
     // Calling SWServerRegistration::clear() takes care of updating m_registrations, m_originStore and m_registrationStore.