Changeset 228069 in webkit

Timestamp:

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

Author:

jmarcell@apple.com

Message:

Cherry-pick r228015. rdar://problem/37220133

Location:

branches/safari-605-branch

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/activation.https-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/workers/service/server/SWServerRegistration.cpp (modified) (2 diffs)

branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228015. rdar://problem/37220133
+
+    2018-02-02  Chris Dumez  <cdumez@apple.com>
+
+            Clearing a registration should null out its workers before setting their state to "redundant"
+            https://bugs.webkit.org/show_bug.cgi?id=182418
+            <rdar://problem/37142874>
+
+            Reviewed by Youenn Fablet.
+
+            Rebaseline WPT test now that all checks are passing. I verified that this test is passing
+            in both Firefox and Chrome.
+
+            * web-platform-tests/service-workers/service-worker/activation.https-expected.txt:
+
 2018-02-04  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/activation.https-expected.txt

@@ -4 +4 @@
 PASS finishing a request triggers activation 
 PASS skipWaiting bypasses no controllee requirement 
-FAIL finishing a request triggers unregister assert_equals: expected null but got object "[object ServiceWorker]"
+PASS finishing a request triggers unregister 
 

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

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228015. rdar://problem/37220133
+
+    2018-02-02  Chris Dumez  <cdumez@apple.com>
+
+            Clearing a registration should null out its workers before setting their state to "redundant"
+            https://bugs.webkit.org/show_bug.cgi?id=182418
+            <rdar://problem/37142874>
+
+            Reviewed by Youenn Fablet.
+
+            Clearing a registration should null out its workers before setting their state to "redundant".
+            This seems to match Firefox and Chrome.
+
+            No new tests, rebaselined existing test.
+
+            * workers/service/server/SWServerRegistration.cpp:
+            (WebCore::SWServerRegistration::clear):
+            (WebCore::clearRegistrationWorker): Deleted.
+
 2018-02-04  Jason Marcell  <jmarcell@apple.com>
 

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

@@ -229 +229 @@
 
 // https://w3c.github.io/ServiceWorker/#clear-registration
-static void clearRegistrationWorker(SWServerRegistration& registration, SWServerWorker* worker, ServiceWorkerRegistrationState state)
-{
-    if (!worker)
-        return;
-
-    worker->terminate();
-    registration.updateWorkerState(*worker, ServiceWorkerState::Redundant);
-    registration.updateRegistrationState(state, nullptr);
-}
-
-// https://w3c.github.io/ServiceWorker/#clear-registration
 void SWServerRegistration::clear()
 {
@@ -248 +237 @@
     }
 
-    clearRegistrationWorker(*this, installingWorker(), ServiceWorkerRegistrationState::Installing);
-    clearRegistrationWorker(*this, waitingWorker(), ServiceWorkerRegistrationState::Waiting);
-    clearRegistrationWorker(*this, activeWorker(), ServiceWorkerRegistrationState::Active);
+    RefPtr<SWServerWorker> installingWorker = this->installingWorker();
+    if (installingWorker) {
+        installingWorker->terminate();
+        updateRegistrationState(ServiceWorkerRegistrationState::Installing, nullptr);
+    }
+    RefPtr<SWServerWorker> waitingWorker = this->waitingWorker();
+    if (waitingWorker) {
+        waitingWorker->terminate();
+        updateRegistrationState(ServiceWorkerRegistrationState::Waiting, nullptr);
+    }
+    RefPtr<SWServerWorker> activeWorker = this->activeWorker();
+    if (activeWorker) {
+        activeWorker->terminate();
+        updateRegistrationState(ServiceWorkerRegistrationState::Active, nullptr);
+    }
+
+    if (installingWorker)
+        updateWorkerState(*installingWorker, ServiceWorkerState::Redundant);
+    if (waitingWorker)
+        updateWorkerState(*waitingWorker, ServiceWorkerState::Redundant);
+    if (activeWorker)
+        updateWorkerState(*activeWorker, ServiceWorkerState::Redundant);
 
     // Remove scope to registration map[scopeString].