From 2aeeed05a1f685778b233381d40f8c1e4f2381bd Mon Sep 17 00:00:00 2001 From: Matt Falkenhagen Date: Tue, 19 Jun 2018 16:09:09 +0900 Subject: [PATCH] service worker: skipWaiting() should resolve after activation. See https://github.com/w3c/ServiceWorker/issues/1187 and https://github.com/w3c/ServiceWorker/pull/1327. --- .../resources/skip-waiting-installed-worker.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/service-workers/service-worker/resources/skip-waiting-installed-worker.js b/service-workers/service-worker/resources/skip-waiting-installed-worker.js index b48d502b136066..48582d76dc5168 100644 --- a/service-workers/service-worker/resources/skip-waiting-installed-worker.js +++ b/service-workers/service-worker/resources/skip-waiting-installed-worker.js @@ -1,9 +1,3 @@ -var saw_activate_event = false - -self.addEventListener('activate', function() { - saw_activate_event = true; - }); - self.addEventListener('message', function(event) { var port = event.data.port; event.waitUntil(self.skipWaiting() @@ -13,15 +7,9 @@ self.addEventListener('message', function(event) { return; } - if (!saw_activate_event) { - port.postMessage( - 'FAIL: Promise should be resolved after activate event is dispatched'); - return; - } - - if (self.registration.active.state !== 'activating') { + if (self.registration.active.state !== 'activated') { port.postMessage( - 'FAITL: Promise should be resolved before ServiceWorker#state is set to activated'); + 'FAIL: Promise should be resolved after ServiceWorker#state is set to activated'); return; }