uncontrol clients no longer matches by the active scope

Author: wanderview

docs/index.bs

@@ -122,8 +122,6 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
 }
 </pre>
 
-<!-- TODO: uncontrol old clients that no longer match in Activate -->
-
 <section>
   <h2 id="motivations">Motivations</h2>
 
@@ -2865,6 +2863,10 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
       1. If |registration|'s [=active worker=] is not null, then:
           1. [=Terminate Service Worker|Terminate=] |registration|'s [=active worker=].
           1. Run the [=Update Worker State=] algorithm passing |registration|'s [=active worker=] and "`redundant`" as the arguments.
+      1. Let |oldUsingClients| be a [=list=] of [=/service worker clients=] who are <a>using</a> |registration|.
+
+      Note: We must get the list of clients prior to clearing the old <a>active worker</a> from |registration|.  Otherwise the [=/service worker client=] will not be considered to be <a>using</a> |registration| any more since |registration| will no longer be the <a>containing service worker registration</a>.
+
       1. Run the <a>Update Registration State</a> algorithm passing |registration|, "<code>active</code>" and |registration|'s <a>waiting worker</a> as the arguments.
       1. Run the <a>Update Registration State</a> algorithm passing |registration|, "<code>waiting</code>" and null as the arguments.
       1. Run the <a>Update Worker State</a> algorithm passing |registration|'s <a>active worker</a> and "`activating`" as the arguments.
@@ -2884,9 +2886,12 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
 
           Note: Resources will now use the service worker registration instead of the existing application cache.
 
-      1. For each [=/service worker client=] |client| who is <a>using</a> |registration|:
-          1. Set |client|'s <a>active worker</a> to |registration|'s <a>active worker</a>.
-          1. Invoke <a>Notify Controller Change</a> algorithm with |client| as the argument.
+      1. [=list/For each=] |oldClient| of |oldUsingClients|:
+          1. If |oldClient|'s <a>creation URL</a> <a lt="Match Service Worker Registration">matches</a> |registration|'s [=active worker=]'s [=service worker/scope url=], then:
+              1. Set |client|'s <a>active worker</a> to |registration|'s <a>active worker</a>.
+          1. Else:
+              1. Set |oldClient|'s <a>active worker</a> to null.
+          1. Invoke <a>Notify Controller Change</a> algorithm with |oldClient| as the argument.
       1. Let |activeWorker| be |registration|'s <a>active worker</a>.
       1. If the result of running the [=Should Skip Event=] algorithm with |activeWorker| and "activate" is false, then:
           1. If the result of running the [=Run Service Worker=] algorithm with |activeWorker| is not *failure*, then: