diff --git a/docs/index.html b/docs/index.html
index 8eb43788..48badfb6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1177,9 +1177,9 @@
 	}
 </style>
   <link href="https://www.w3.org/StyleSheets/TR/2016/W3C-ED" rel="stylesheet" type="text/css">
-  <meta content="Bikeshed version 684b7af5acf2630a118f6d3ab3978cfc3d7e431f" name="generator">
+  <meta content="Bikeshed version bbd6a9c4064dd454886bb3e0c74f0a19865c3c74" name="generator">
   <link href="https://www.w3.org/TR/service-workers/" rel="canonical">
-  <meta content="fb87f29eaed9ea1df0f8f97fa791eb62b4f3e495" name="document-revision">
+  <meta content="58fd4671b66e19bdbaccbafae80fe58fc82b4592" name="document-revision">
 <style>/* style-md-lists */
 
 /* This is a weird hack for me not yet following the commonmark spec
@@ -1426,7 +1426,7 @@
   <div class="head">
    <p data-fill-with="logo"><a class="logo" href="https://www.w3.org/"> <img alt="W3C" height="48" src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72"> </a> </p>
    <h1 class="p-name no-ref" id="title">Service Workers Nightly</h1>
-   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-12-21">21 December 2017</time></span></h2>
+   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-12-22">22 December 2017</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -2167,6 +2167,8 @@ <h4 class="heading settled" data-level="3.4.4" id="navigator-service-worker-getR
         <p>Let <var>clientURL</var> be the result of <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-parser" id="ref-for-concept-url-parser②">parsing</a> <var>clientURL</var> with the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object①⑥">context object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="ref-for-relevant-settings-object⑦">relevant settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#api-base-url" id="ref-for-api-base-url②">API base URL</a>.</p>
        <li data-md="">
         <p>If <var>clientURL</var> is failure, return a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects⑦">promise</a> rejected with a <code>TypeError</code>.</p>
+       <li data-md="">
+        <p>Set <var>clientURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment">fragment</a> to null.</p>
        <li data-md="">
         <p>If the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin②">origin</a> of <var>clientURL</var> is not <var>client</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin③">origin</a>, return a <var>promise</var> rejected with a "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#securityerror" id="ref-for-securityerror">SecurityError</a></code>" <code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#idl-DOMException" id="ref-for-idl-DOMException③">DOMException</a></code>.</p>
        <li data-md="">
@@ -4423,6 +4425,9 @@ <h3 class="heading settled" id="start-register-algorithm"><span class="content">
      <ol>
       <li data-md="">
        <p>If <var>scriptURL</var> is failure, reject <var>promise</var> with a <code>TypeError</code> and abort these steps.</p>
+      <li data-md="">
+       <p>Set <var>scriptURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment①">fragment</a> to null.</p>
+       <p class="note" role="note"><span>Note:</span> The user agent does not store the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment②">fragment</a> of the script’s url. This means that the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment③">fragment</a> does not have an effect on identifying <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑥">service workers</a>.</p>
       <li data-md="">
        <p>If <var>scriptURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-scheme" id="ref-for-concept-url-scheme④">scheme</a> is not one of "<code>http</code>" and "<code>https</code>", reject <var>promise</var> with a <code>TypeError</code> and abort these steps.</p>
       <li data-md="">
@@ -4432,6 +4437,9 @@ <h3 class="heading settled" id="start-register-algorithm"><span class="content">
        <p class="note" role="note"><span>Note:</span> The scope url for the registration is set to the location of the service worker script by default.</p>
       <li data-md="">
        <p>If <var>scopeURL</var> is failure, reject <var>promise</var> with a <code>TypeError</code> and abort these steps.</p>
+      <li data-md="">
+       <p>Set <var>scopeURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment④">fragment</a> to null.</p>
+       <p class="note" role="note"><span>Note:</span> The user agent does not store the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment⑤">fragment</a> of the scope url. This means that the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment⑥">fragment</a> does not have an effect on identifying <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑥">service worker registrations</a>.</p>
       <li data-md="">
        <p>If <var>scopeURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-scheme" id="ref-for-concept-url-scheme⑤">scheme</a> is not one of "<code>http</code>" and "<code>https</code>", reject <var>promise</var> with a <code>TypeError</code> and abort these steps.</p>
       <li data-md="">
@@ -4493,7 +4501,7 @@ <h3 class="heading settled" id="register-algorithm"><span class="content"><dfn c
         <li data-md="">
          <p>Let <var>newestWorker</var> be the result of running the <a data-link-type="dfn" href="#get-newest-worker" id="ref-for-get-newest-worker①">Get Newest Worker</a> algorithm passing <var>registration</var> as the argument.</p>
         <li data-md="">
-         <p>If <var>newestWorker</var> is not null, <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals">equals</a> <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url②">script url</a> with the <em>exclude fragments flag</em> set, and <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-update-via-cache-mode" id="ref-for-dfn-job-update-via-cache-mode①">update via cache mode</a>'s value equals <var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache③">update via cache mode</a>, then:</p>
+         <p>If <var>newestWorker</var> is not null, <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals">equals</a> <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url②">script url</a>, and <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-update-via-cache-mode" id="ref-for-dfn-job-update-via-cache-mode①">update via cache mode</a>'s value equals <var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache③">update via cache mode</a>, then:</p>
          <ol>
           <li data-md="">
            <p>Invoke <a data-link-type="dfn" href="#resolve-job-promise" id="ref-for-resolve-job-promise">Resolve Job Promise</a> with <var>job</var> and <var>registration</var>.</p>
@@ -4535,7 +4543,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
       <li data-md="">
        <p>Let <var>newestWorker</var> be the result of running <a data-link-type="dfn" href="#get-newest-worker" id="ref-for-get-newest-worker②">Get Newest Worker</a> algorithm passing <var>registration</var> as the argument.</p>
       <li data-md="">
-       <p>If <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-type" id="ref-for-dfn-job-type⑧">job type</a> is <em>update</em>, and <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url③">script url</a> does not <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals①">equal</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url⑤">script url</a> with the <em>exclude fragments flag</em> set, then:</p>
+       <p>If <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-type" id="ref-for-dfn-job-type⑧">job type</a> is <em>update</em>, and <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url③">script url</a> does not <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals①">equal</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url⑤">script url</a>, then:</p>
        <ol>
         <li data-md="">
          <p>Invoke <a data-link-type="dfn" href="#reject-job-promise" id="ref-for-reject-job-promise④">Reject Job Promise</a> with <var>job</var> and <code>TypeError</code>.</p>
@@ -4649,7 +4657,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
        </ol>
        <p>Else, continue the rest of these steps after the algorithm’s asynchronous completion, with <var>script</var> being the asynchronous completion value.</p>
       <li data-md="">
-       <p>If <var>newestWorker</var> is not null, <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals②">equals</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url①⓪">script url</a> with the <em>exclude fragments flag</em> set, and <var>script</var>’s <a data-link-type="dfn">source text</a> is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑤">script resource</a>'s <a data-link-type="dfn">source text</a>, if <var>script</var> is a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#classic-script" id="ref-for-classic-script">classic script</a>, and <var>script</var>’s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑥">script resource</a>'s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] otherwise, then:</p>
+       <p>If <var>newestWorker</var> is not null, <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals②">equals</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url①⓪">script url</a>, and <var>script</var>’s <a data-link-type="dfn">source text</a> is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑤">script resource</a>'s <a data-link-type="dfn">source text</a>, if <var>script</var> is a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#classic-script" id="ref-for-classic-script">classic script</a>, and <var>script</var>’s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑥">script resource</a>'s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] otherwise, then:</p>
        <ol>
         <li data-md="">
          <p>Invoke <a data-link-type="dfn" href="#resolve-job-promise" id="ref-for-resolve-job-promise①">Resolve Job Promise</a> with <var>job</var> and <var>registration</var>.</p>
@@ -4660,7 +4668,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
        <p>Else:</p>
        <ol>
         <li data-md="">
-         <p>Let <var>worker</var> be a new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑥">service worker</a>.</p>
+         <p>Let <var>worker</var> be a new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑦">service worker</a>.</p>
         <li data-md="">
          <p>Set <var>worker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url⑤">script url</a> to <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url①①">script url</a>, <var>worker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑦">script resource</a> to <var>script</var>, and <var>worker</var>’s <a data-link-type="dfn" href="#dfn-type" id="ref-for-dfn-type①">type</a> to <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-worker-type" id="ref-for-dfn-job-worker-type④">worker type</a>.</p>
         <li data-md="">
@@ -4690,7 +4698,7 @@ <h3 class="heading settled" id="soft-update-algorithm"><span class="content"><df
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑥">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑦">service worker registration</a></p>
       <dd data-md="">
        <p><em>force bypass cache flag</em>, an optional flag unset by default</p>
        <p class="note" role="note"><span>Note:</span> Implementers may use the <em>force bypass cache flag</em> to aid debugging (e.g. invocations from developer tools), and other specifications that extend service workers may also use the flag on their own needs.</p>
@@ -4720,9 +4728,9 @@ <h3 class="heading settled" id="installation-algorithm"><span class="content"><d
       <dd data-md="">
        <p><var>job</var>, a <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job②⑤">job</a></p>
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑦">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑧">service worker</a></p>
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑦">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑧">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>none</p>
@@ -4741,7 +4749,7 @@ <h3 class="heading settled" id="installation-algorithm"><span class="content"><d
       <li data-md="">
        <p>Invoke <a data-link-type="dfn" href="#resolve-job-promise" id="ref-for-resolve-job-promise②">Resolve Job Promise</a> with <var>job</var> and <var>registration</var>.</p>
       <li data-md="">
-       <p><a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="ref-for-queue-a-task②①">Queue a task</a> to <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-fire" id="ref-for-concept-event-fire②">fire an event</a> named <code>updatefound</code> at all the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration①⑧">ServiceWorkerRegistration</a></code> objects for all the <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③⑨">service worker clients</a> whose <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-creation-url" id="ref-for-concept-environment-creation-url①②">creation URL</a> <a data-link-type="dfn" href="#match-service-worker-registration" id="ref-for-match-service-worker-registration⑦">matches</a> <var>registration</var>’s <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①④">scope url</a> and all the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑧">service workers</a> whose <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration①②">containing service worker registration</a> is <var>registration</var>.</p>
+       <p><a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="ref-for-queue-a-task②①">Queue a task</a> to <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-fire" id="ref-for-concept-event-fire②">fire an event</a> named <code>updatefound</code> at all the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration①⑧">ServiceWorkerRegistration</a></code> objects for all the <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③⑨">service worker clients</a> whose <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-creation-url" id="ref-for-concept-environment-creation-url①②">creation URL</a> <a data-link-type="dfn" href="#match-service-worker-registration" id="ref-for-match-service-worker-registration⑦">matches</a> <var>registration</var>’s <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①④">scope url</a> and all the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑨">service workers</a> whose <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration①②">containing service worker registration</a> is <var>registration</var>.</p>
       <li data-md="">
        <p>Let <var>installingWorker</var> be <var>registration</var>’s <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker⑦">installing worker</a>.</p>
       <li data-md="">
@@ -4811,7 +4819,7 @@ <h3 class="heading settled" id="activation-algorithm"><span class="content"><dfn
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑧">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑨">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -4880,7 +4888,7 @@ <h3 class="heading settled" id="try-activate-algorithm"><span class="content"><d
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑨">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⓪">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -4906,7 +4914,7 @@ <h3 class="heading settled" id="run-service-worker-algorithm"><span class="conte
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑨">service worker</a></p>
+       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⓪">service worker</a></p>
       <dd data-md="">
        <p><em>force bypass cache for importscripts flag</em>, an optional flag unset by default</p>
       <dt data-md="">Output
@@ -5008,7 +5016,7 @@ <h3 class="heading settled" id="terminate-service-worker-algorithm"><span class=
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⓪">service worker</a></p>
+       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨①">service worker</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5031,7 +5039,7 @@ <h3 class="heading settled" id="terminate-service-worker-algorithm"><span class=
     </section>
     <section class="algorithm" data-algorithm="Handle Fetch">
      <h3 class="heading settled" id="on-fetch-request-algorithm"><span class="content"><dfn class="dfn-paneled" data-dfn-type="dfn" data-export="" id="handle-fetch">Handle Fetch</dfn></span><a class="self-link" href="#on-fetch-request-algorithm"></a></h3>
-     <p>The <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch⑥">Handle Fetch</a> algorithm is the entry point for the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①③">fetch</a> handling handed to the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨①">service worker</a> context.</p>
+     <p>The <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch⑥">Handle Fetch</a> algorithm is the entry point for the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①③">fetch</a> handling handed to the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨②">service worker</a> context.</p>
      <dl>
       <dt data-md="">Input
       <dd data-md="">
@@ -5235,7 +5243,7 @@ <h3 class="heading settled" id="handle-functional-event-algorithm"><span class="
       <dd data-md="">
        <p><var>event</var>, an <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent①⑤">ExtendableEvent</a></code> object</p>
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⓪">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥①">service worker registration</a></p>
       <dd data-md="">
        <p><var>callbackSteps</var>, an algorithm</p>
       <dt data-md="">Output
@@ -5294,7 +5302,7 @@ <h3 class="heading settled" id="on-client-unload-algorithm"><span class="content
       <li data-md="">
        <p>Run the following steps atomically.</p>
       <li data-md="">
-       <p>Let <var>registration</var> be the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥①">service worker registration</a> <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use⑥">used</a> by <var>client</var>.</p>
+       <p>Let <var>registration</var> be the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥②">service worker registration</a> <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use⑥">used</a> by <var>client</var>.</p>
       <li data-md="">
        <p>If <var>registration</var> is null, abort these steps.</p>
       <li data-md="">
@@ -5341,7 +5349,7 @@ <h3 class="heading settled" id="update-service-worker-extended-events-set-algori
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨②">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨③">service worker</a></p>
       <dd data-md="">
        <p><var>event</var>, an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event③">event</a></p>
       <dt data-md="">Output
@@ -5411,7 +5419,7 @@ <h3 class="heading settled" id="set-registration-algorithm"><span class="content
        <p><var>updateViaCache</var>, an <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache⑤">update via cache mode</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥②">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥③">service worker registration</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5419,7 +5427,7 @@ <h3 class="heading settled" id="set-registration-algorithm"><span class="content
       <li data-md="">
        <p>Let <var>scopeString</var> be <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer⑨">serialized</a> <var>scope</var> with the <em>exclude fragment flag</em> set.</p>
       <li data-md="">
-       <p>Let <var>registration</var> be a new <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥③">service worker registration</a> whose <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑥">scope url</a> is set to <var>scope</var> and <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache⑥">update via cache mode</a> is set to <var>updateViaCache</var>.</p>
+       <p>Let <var>registration</var> be a new <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥④">service worker registration</a> whose <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑥">scope url</a> is set to <var>scope</var> and <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache⑥">update via cache mode</a> is set to <var>updateViaCache</var>.</p>
       <li data-md="">
        <p><a data-link-type="dfn" href="https://infra.spec.whatwg.org/#map-set" id="ref-for-map-set③">Set</a> <a data-link-type="dfn" href="#dfn-scope-to-registration-map" id="ref-for-dfn-scope-to-registration-map⑧">scope to registration map</a>[<var>scopeString</var>] to <var>registration</var>.</p>
       <li data-md="">
@@ -5431,7 +5439,7 @@ <h3 class="heading settled" id="clear-registration-algorithm"><span class="conte
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥④">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑤">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5470,7 +5478,7 @@ <h3 class="heading settled" id="clear-registration-algorithm"><span class="conte
          <p>Run the <a data-link-type="dfn" href="#update-registration-state" id="ref-for-update-registration-state⑧">Update Registration State</a> algorithm passing <var>registration</var>, "<code>active</code>" and null as the arguments.</p>
        </ol>
       <li data-md="">
-       <p>Let <var>scopeString</var> be <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer①⓪">serialized</a> <var>registration</var>’s <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑦">scope url</a> with the <em>exclude fragment flag</em> set.</p>
+       <p>Let <var>scopeString</var> be <var>registration</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer①⓪">serialized</a> <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑦">scope url</a>.</p>
       <li data-md="">
        <p><a data-link-type="dfn" href="https://infra.spec.whatwg.org/#map-remove" id="ref-for-map-remove①">Remove</a> <a data-link-type="dfn" href="#dfn-scope-to-registration-map" id="ref-for-dfn-scope-to-registration-map⑨">scope to registration map</a>[<var>scopeString</var>].</p>
      </ol>
@@ -5480,7 +5488,7 @@ <h3 class="heading settled" id="try-clear-registration-algorithm"><span class="c
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑤">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑥">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5503,11 +5511,11 @@ <h3 class="heading settled" id="update-registration-state-algorithm"><span class
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑥">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑦">service worker registration</a></p>
       <dd data-md="">
        <p><var>target</var>, a string (one of "<code>installing</code>", "<code>waiting</code>", and "<code>active</code>")</p>
       <dd data-md="">
-       <p><var>source</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨③">service worker</a> or null</p>
+       <p><var>source</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨④">service worker</a> or null</p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5559,9 +5567,9 @@ <h3 class="heading settled" id="update-state-algorithm"><span class="content"><d
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨④">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑤">service worker</a></p>
       <dd data-md="">
-       <p><var>state</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑤">service worker</a>'s <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state①⓪">state</a></p>
+       <p><var>state</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑥">service worker</a>'s <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state①⓪">state</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5583,23 +5591,23 @@ <h3 class="heading settled" id="update-state-algorithm"><span class="content"><d
             <dt data-md=""><em>installing</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-installing" id="ref-for-dom-serviceworkerstate-installing">"installing"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑥">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②⓪">installing worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑥">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-oninstall" id="ref-for-dom-serviceworkerglobalscope-oninstall①">oninstall</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑧">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②①">installing worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③④">promise</a> resolves successfully. This is primarily used to ensure that the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑦">service worker</a> is not active until all of the core caches are populated.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑦">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②⓪">installing worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑥">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-oninstall" id="ref-for-dom-serviceworkerglobalscope-oninstall①">oninstall</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑧">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②①">installing worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③④">promise</a> resolves successfully. This is primarily used to ensure that the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑧">service worker</a> is not active until all of the core caches are populated.</p>
             <dt data-md=""><em>installed</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-installed" id="ref-for-dom-serviceworkerstate-installed">"installed"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑧">service worker</a> in this state is considered a <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker②①">waiting worker</a>.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑨">service worker</a> in this state is considered a <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker②①">waiting worker</a>.</p>
             <dt data-md=""><em>activating</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-activating" id="ref-for-dom-serviceworkerstate-activating">"activating"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑨">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑤②">active worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑦">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-onactivate" id="ref-for-dom-serviceworkerglobalscope-onactivate①">onactivate</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑨">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑤③">active worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③⑤">promise</a> resolves successfully. No <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑨">functional events</a> are dispatched until the state becomes <em>activated</em>.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⓪">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑤②">active worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑦">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-onactivate" id="ref-for-dom-serviceworkerglobalscope-onactivate①">onactivate</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑨">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑤③">active worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③⑤">promise</a> resolves successfully. No <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑨">functional events</a> are dispatched until the state becomes <em>activated</em>.</p>
             <dt data-md=""><em>activated</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-activated" id="ref-for-dom-serviceworkerstate-activated">"activated"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⓪">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑤④">active worker</a> ready to handle <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①⓪">functional events</a>.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪①">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑤④">active worker</a> ready to handle <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①⓪">functional events</a>.</p>
             <dt data-md=""><em>redundant</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-redundant" id="ref-for-dom-serviceworkerstate-redundant①">"redundant"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> A new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪①">service worker</a> is replacing the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪②">service worker</a>, or the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪③">service worker</a> is being discarded due to an install failure.</p>
+             <p class="note" role="note"><span>Note:</span> A new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪②">service worker</a> is replacing the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪③">service worker</a>, or the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪④">service worker</a> is being discarded due to an install failure.</p>
            </dl>
           <li data-md="">
            <p><a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-fire" id="ref-for-concept-event-fire③">Fire an event</a> named <code>statechange</code> at <var>workerObject</var>.</p>
@@ -5634,7 +5642,7 @@ <h3 class="heading settled" id="scope-match-algorithm"><span class="content"><df
        <p><var>clientURL</var>, a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url①②">URL</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑦">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑧">service worker registration</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5674,7 +5682,7 @@ <h3 class="heading settled" id="get-registration-algorithm"><span class="content
        <p><var>scope</var>, a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url①③">URL</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑧">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑨">service worker registration</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5700,10 +5708,10 @@ <h3 class="heading settled" id="get-newest-worker-algorithm"><span class="conten
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⑨">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑦⓪">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>newestWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪④">service worker</a></p>
+       <p><var>newestWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑤">service worker</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5725,7 +5733,7 @@ <h3 class="heading settled" id="service-worker-has-no-pending-events-algorithm">
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑤">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑥">service worker</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>True or false, a boolean</p>
@@ -5844,7 +5852,7 @@ <h3 class="heading settled" id="query-cache-algorithm"><span class="content"><df
            <p>Set <var>requestURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-query" id="ref-for-concept-url-query①">query</a> to the empty string.</p>
          </ol>
         <li data-md="">
-         <p>If <var>cachedURL</var> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals③">equals</a> <var>requestURL</var> with the <em>exclude fragments flag</em> set, then:</p>
+         <p>If <var>cachedURL</var> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals③">equals</a> <var>requestURL</var> with the <em>exclude fragment flag</em> set, then:</p>
          <ol>
           <li data-md="">
            <p>Add a copy of <var>requestResponse</var>’s request to <var>requests</var>.</p>
@@ -5993,17 +6001,17 @@ <h3 class="heading settled" id="batch-cache-operations-algorithm"><span class="c
     <h2 class="heading settled" id="extended-http-headers"><span class="content">Appendix B: Extended HTTP headers</span><a class="self-link" href="#extended-http-headers"></a></h2>
     <section>
      <h3 class="heading settled" id="service-worker-script-request"><span class="content">Service Worker Script Request</span><a class="self-link" href="#service-worker-script-request"></a></h3>
-     <p>An HTTP request to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①⑦">fetch</a> a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑥">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①③">script resource</a> will include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header④">header</a>:</p>
+     <p>An HTTP request to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①⑦">fetch</a> a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑦">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①③">script resource</a> will include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header④">header</a>:</p>
      <dl>
       <dt data-md="">`<dfn data-dfn-type="dfn" data-noexport="" id="service-worker"><code>Service-Worker</code><a class="self-link" href="#service-worker"></a></dfn>`
       <dd data-md="">
-       <p>Indicates this request is a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑦">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①④">script resource</a> request.</p>
+       <p>Indicates this request is a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑧">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①④">script resource</a> request.</p>
        <p class="note" role="note"><span>Note:</span> This header helps administrators log the requests and detect threats.</p>
      </dl>
     </section>
     <section>
      <h3 class="heading settled" id="service-worker-script-response"><span class="content">Service Worker Script Response</span><a class="self-link" href="#service-worker-script-response"></a></h3>
-     <p>An HTTP response to a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑧">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑤">script resource</a> request can include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header⑤">header</a>:</p>
+     <p>An HTTP response to a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑨">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑤">script resource</a> request can include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header⑤">header</a>:</p>
      <dl>
       <dt data-md="">`<dfn data-dfn-type="dfn" data-noexport="" id="service-worker-allowed"><code>Service-Worker-Allowed</code><a class="self-link" href="#service-worker-allowed"></a></dfn>`
       <dd data-md="">
@@ -6049,7 +6057,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
     </section>
     <section>
      <h3 class="heading settled" id="syntax"><span class="content">Syntax</span><a class="self-link" href="#syntax"></a></h3>
-     <p><a data-link-type="biblio" href="#biblio-rfc5234">ABNF</a> for the values of the headers used by the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑨">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑥">script resource</a> requests and responses:</p>
+     <p><a data-link-type="biblio" href="#biblio-rfc5234">ABNF</a> for the values of the headers used by the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①①⓪">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑥">script resource</a> requests and responses:</p>
 <pre>Service-Worker = %x73.63.72.69.70.74 ; "script", case-sensitive
 </pre>
      <p class="note" role="note"><span>Note:</span> The validation of the Service-Worker-Allowed header’s values is done by URL parsing algorithm (in Update algorithm) instead of using ABNF.</p>
@@ -6827,6 +6835,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
     <a data-link-type="biblio">[URL]</a> defines the following terms:
     <ul>
      <li><a href="https://url.spec.whatwg.org/#concept-url-equals">equal</a>
+     <li><a href="https://url.spec.whatwg.org/#concept-url-fragment">fragment</a>
      <li><a href="https://url.spec.whatwg.org/#concept-url-origin">origin</a>
      <li><a href="https://url.spec.whatwg.org/#concept-url-path">path</a>
      <li><a href="https://url.spec.whatwg.org/#concept-url-query">query</a>
@@ -7171,19 +7180,20 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
     <li><a href="#ref-for-dfn-service-worker⑧②">6.6. Privacy</a> <a href="#ref-for-dfn-service-worker⑧③">(2)</a>
     <li><a href="#ref-for-dfn-service-worker⑧④">7. Extensibility</a>
     <li><a href="#ref-for-dfn-service-worker⑧⑤">7.4. Request Functional Event Dispatch</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑥">Update</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑦">Install</a> <a href="#ref-for-dfn-service-worker⑧⑧">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑨">Run Service Worker</a>
-    <li><a href="#ref-for-dfn-service-worker⑨⓪">Terminate Service Worker</a>
-    <li><a href="#ref-for-dfn-service-worker⑨①">Handle Fetch</a>
-    <li><a href="#ref-for-dfn-service-worker⑨②">Update Service Worker Extended Events Set</a>
-    <li><a href="#ref-for-dfn-service-worker⑨③">Update Registration State</a>
-    <li><a href="#ref-for-dfn-service-worker⑨④">Update Worker State</a> <a href="#ref-for-dfn-service-worker⑨⑤">(2)</a> <a href="#ref-for-dfn-service-worker⑨⑥">(3)</a> <a href="#ref-for-dfn-service-worker⑨⑦">(4)</a> <a href="#ref-for-dfn-service-worker⑨⑧">(5)</a> <a href="#ref-for-dfn-service-worker⑨⑨">(6)</a> <a href="#ref-for-dfn-service-worker①⓪⓪">(7)</a> <a href="#ref-for-dfn-service-worker①⓪①">(8)</a> <a href="#ref-for-dfn-service-worker①⓪②">(9)</a> <a href="#ref-for-dfn-service-worker①⓪③">(10)</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪④">Get Newest Worker</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑤">Service Worker Has No Pending Events</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑥">Service Worker Script Request</a> <a href="#ref-for-dfn-service-worker①⓪⑦">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑧">Service Worker Script Response</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑨">Syntax</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑥">Start Register</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑦">Update</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑧">Install</a> <a href="#ref-for-dfn-service-worker⑧⑨">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑨⓪">Run Service Worker</a>
+    <li><a href="#ref-for-dfn-service-worker⑨①">Terminate Service Worker</a>
+    <li><a href="#ref-for-dfn-service-worker⑨②">Handle Fetch</a>
+    <li><a href="#ref-for-dfn-service-worker⑨③">Update Service Worker Extended Events Set</a>
+    <li><a href="#ref-for-dfn-service-worker⑨④">Update Registration State</a>
+    <li><a href="#ref-for-dfn-service-worker⑨⑤">Update Worker State</a> <a href="#ref-for-dfn-service-worker⑨⑥">(2)</a> <a href="#ref-for-dfn-service-worker⑨⑦">(3)</a> <a href="#ref-for-dfn-service-worker⑨⑧">(4)</a> <a href="#ref-for-dfn-service-worker⑨⑨">(5)</a> <a href="#ref-for-dfn-service-worker①⓪⓪">(6)</a> <a href="#ref-for-dfn-service-worker①⓪①">(7)</a> <a href="#ref-for-dfn-service-worker①⓪②">(8)</a> <a href="#ref-for-dfn-service-worker①⓪③">(9)</a> <a href="#ref-for-dfn-service-worker①⓪④">(10)</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑤">Get Newest Worker</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑥">Service Worker Has No Pending Events</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑦">Service Worker Script Request</a> <a href="#ref-for-dfn-service-worker①⓪⑧">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑨">Service Worker Script Response</a>
+    <li><a href="#ref-for-dfn-service-worker①①⓪">Syntax</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="dfn-state">
@@ -7360,19 +7370,20 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
     <li><a href="#ref-for-dfn-service-worker-registration⑤②">7.1. Define API bound to Service Worker Registration</a>
     <li><a href="#ref-for-dfn-service-worker-registration⑤③">7.4. Request Functional Event Dispatch</a>
     <li><a href="#ref-for-dfn-service-worker-registration⑤④">Appendix A: Algorithms</a> <a href="#ref-for-dfn-service-worker-registration⑤⑤">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑥">Soft Update</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑦">Install</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑧">Activate</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑨">Try Activate</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⓪">Handle Functional Event</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥①">Handle Service Worker Client Unload</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥②">Set Registration</a> <a href="#ref-for-dfn-service-worker-registration⑥③">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥④">Clear Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⑤">Try Clear Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⑥">Update Registration State</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⑦">Match Service Worker Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⑧">Get Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⑨">Get Newest Worker</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑥">Start Register</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑦">Soft Update</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑧">Install</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑨">Activate</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⓪">Try Activate</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥①">Handle Functional Event</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥②">Handle Service Worker Client Unload</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥③">Set Registration</a> <a href="#ref-for-dfn-service-worker-registration⑥④">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⑤">Clear Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⑥">Try Clear Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⑦">Update Registration State</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⑧">Match Service Worker Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⑨">Get Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑦⓪">Get Newest Worker</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="dfn-scope-url">
diff --git a/docs/v1/index.html b/docs/v1/index.html
index a3f8498d..82e013f8 100644
--- a/docs/v1/index.html
+++ b/docs/v1/index.html
@@ -1177,9 +1177,9 @@
 	}
 </style>
   <link href="https://www.w3.org/StyleSheets/TR/2016/W3C-ED" rel="stylesheet" type="text/css">
-  <meta content="Bikeshed version 684b7af5acf2630a118f6d3ab3978cfc3d7e431f" name="generator">
+  <meta content="Bikeshed version bbd6a9c4064dd454886bb3e0c74f0a19865c3c74" name="generator">
   <link href="https://www.w3.org/TR/service-workers/" rel="canonical">
-  <meta content="fb87f29eaed9ea1df0f8f97fa791eb62b4f3e495" name="document-revision">
+  <meta content="58fd4671b66e19bdbaccbafae80fe58fc82b4592" name="document-revision">
 <style>/* style-md-lists */
 
 /* This is a weird hack for me not yet following the commonmark spec
@@ -1426,7 +1426,7 @@
   <div class="head">
    <p data-fill-with="logo"><a class="logo" href="https://www.w3.org/"> <img alt="W3C" height="48" src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72"> </a> </p>
    <h1 class="p-name no-ref" id="title">Service Workers 1</h1>
-   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-12-21">21 December 2017</time></span></h2>
+   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-12-22">22 December 2017</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -2133,6 +2133,9 @@ <h4 class="heading settled" data-level="3.4.3" id="navigator-service-worker-regi
         <p>Let <var>scriptURL</var> be the result of <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-parser" id="ref-for-concept-url-parser">parsing</a> <var>scriptURL</var> with the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object①③">context object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="ref-for-relevant-settings-object⑤">relevant settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#api-base-url" id="ref-for-api-base-url">API base URL</a>.</p>
        <li data-md="">
         <p>If <var>scriptURL</var> is failure, reject <var>p</var> with a <code>TypeError</code> and abort these steps.</p>
+       <li data-md="">
+        <p>Set <var>scriptURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment">fragment</a> to null.</p>
+        <p class="note" role="note"><span>Note:</span> The user agent does not store the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment①">fragment</a> of the script’s url. This means that the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment②">fragment</a> does not have an effect on identifying <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑧">service workers</a>.</p>
        <li data-md="">
         <p>If <var>scriptURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-scheme" id="ref-for-concept-url-scheme">scheme</a> is not one of "<code>http</code>" and "<code>https</code>", reject <var>p</var> with a <code>TypeError</code> and abort these steps.</p>
        <li data-md="">
@@ -2146,6 +2149,9 @@ <h4 class="heading settled" data-level="3.4.3" id="navigator-service-worker-regi
         <p>Else, set <var>scopeURL</var> to the result of <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-parser" id="ref-for-concept-url-parser②">parsing</a> <var>options</var>.<code class="idl"><a data-link-type="idl" href="#dom-registrationoptions-scope" id="ref-for-dom-registrationoptions-scope①">scope</a></code> with the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object①④">context object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="ref-for-relevant-settings-object⑥">relevant settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#api-base-url" id="ref-for-api-base-url①">API base URL</a>.</p>
        <li data-md="">
         <p>If <var>scopeURL</var> is failure, reject <var>p</var> with a <code>TypeError</code> and abort these steps.</p>
+       <li data-md="">
+        <p>Set <var>scopeURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment③">fragment</a> to null.</p>
+        <p class="note" role="note"><span>Note:</span> The user agent does not store the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment④">fragment</a> of the scope url. This means that the <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment⑤">fragment</a> does not have an effect on identifying <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⓪">service worker registrations</a>.</p>
        <li data-md="">
         <p>If <var>scopeURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-scheme" id="ref-for-concept-url-scheme①">scheme</a> is not one of "<code>http</code>" and "<code>https</code>", reject <var>p</var> with a <code>TypeError</code> and abort these steps.</p>
        <li data-md="">
@@ -2172,6 +2178,8 @@ <h4 class="heading settled" data-level="3.4.4" id="navigator-service-worker-getR
         <p>Let <var>clientURL</var> be the result of <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-parser" id="ref-for-concept-url-parser③">parsing</a> <var>clientURL</var> with the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object①⑥">context object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="ref-for-relevant-settings-object⑦">relevant settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#api-base-url" id="ref-for-api-base-url②">API base URL</a>.</p>
        <li data-md="">
         <p>If <var>clientURL</var> is failure, return a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects⑦">promise</a> rejected with a <code>TypeError</code>.</p>
+       <li data-md="">
+        <p>Set <var>clientURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-fragment" id="ref-for-concept-url-fragment⑥">fragment</a> to null.</p>
        <li data-md="">
         <p>If the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin②">origin</a> of <var>clientURL</var> is not <var>client</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin③">origin</a>, return a <var>promise</var> rejected with a "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#securityerror" id="ref-for-securityerror">SecurityError</a></code>" <code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#idl-DOMException" id="ref-for-idl-DOMException③">DOMException</a></code>.</p>
        <li data-md="">
@@ -2297,7 +2305,7 @@ <h3 class="heading settled" data-level="3.5" id="document-context-events"><span
        <tr>
         <td><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerContainer" data-dfn-type="event" data-export="" id="service-worker-container-controllerchange-event"><code>controllerchange</code></dfn>
         <td><code class="idl"><a data-link-type="idl" href="https://dom.spec.whatwg.org/#event" id="ref-for-event②">Event</a></code>
-        <td>The <a data-link-type="dfn" href="#serviceworkercontainer-service-worker-client" id="ref-for-serviceworkercontainer-service-worker-client⑤">service worker client</a>'s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-active-service-worker" id="ref-for-concept-environment-active-service-worker②">active service worker</a> changes. (See step 9.2 of the <a data-link-type="dfn" href="#activate" id="ref-for-activate①">Activate</a> algorithm. The <a data-link-type="dfn" href="#dfn-skip-waiting-flag" id="ref-for-dfn-skip-waiting-flag">skip waiting flag</a> of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑧">service worker</a> causes <a data-link-type="dfn" href="#activate" id="ref-for-activate②">activation</a> of the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⓪">service worker registration</a> to occur while <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②③">service worker clients</a> are <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use①">using</a> the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④①">service worker registration</a>, <code class="idl"><a data-link-type="idl" href="#dom-serviceworkercontainer-controller" id="ref-for-dom-serviceworkercontainer-controller③">navigator.serviceWorker.controller</a></code> immediately reflects the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①③">active worker</a> as the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑨">service worker</a> that <a data-link-type="dfn" href="#dfn-control" id="ref-for-dfn-control②">controls</a> the <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②④">service worker client</a>.)
+        <td>The <a data-link-type="dfn" href="#serviceworkercontainer-service-worker-client" id="ref-for-serviceworkercontainer-service-worker-client⑤">service worker client</a>'s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-active-service-worker" id="ref-for-concept-environment-active-service-worker②">active service worker</a> changes. (See step 9.2 of the <a data-link-type="dfn" href="#activate" id="ref-for-activate①">Activate</a> algorithm. The <a data-link-type="dfn" href="#dfn-skip-waiting-flag" id="ref-for-dfn-skip-waiting-flag">skip waiting flag</a> of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑨">service worker</a> causes <a data-link-type="dfn" href="#activate" id="ref-for-activate②">activation</a> of the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④①">service worker registration</a> to occur while <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②③">service worker clients</a> are <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use①">using</a> the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④②">service worker registration</a>, <code class="idl"><a data-link-type="idl" href="#dom-serviceworkercontainer-controller" id="ref-for-dom-serviceworkercontainer-controller③">navigator.serviceWorker.controller</a></code> immediately reflects the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①③">active worker</a> as the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⓪">service worker</a> that <a data-link-type="dfn" href="#dfn-control" id="ref-for-dfn-control②">controls</a> the <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②④">service worker client</a>.)
      </table>
     </section>
    </section>
@@ -2357,8 +2365,8 @@ <h3 class="heading settled" data-level="4.1" id="serviceworkerglobalscope-interf
   <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler" id="ref-for-eventhandler⑨">EventHandler</a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkerglobalscope-onmessageerror" id="ref-for-dom-serviceworkerglobalscope-onmessageerror">onmessageerror</a>;
 };
 </pre>
-     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑥">ServiceWorkerGlobalScope</a></code> object represents the global execution context of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⓪">service worker</a>. A <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑦">ServiceWorkerGlobalScope</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="dfn" data-noexport="" id="serviceworkerglobalscope-service-worker">service worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤①">service worker</a>). A <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑧">ServiceWorkerGlobalScope</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="dfn" data-noexport="" id="serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag">force bypass cache for importscripts flag</dfn>. It is initially unset.</p>
-     <p class="note" role="note"><span>Note:</span> <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑨">ServiceWorkerGlobalScope</a></code> object provides generic, event-driven, time-limited script execution contexts that run at an origin. Once successfully <a data-link-type="dfn" href="#register" id="ref-for-register①">registered</a>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤②">service worker</a> is started, kept alive and killed by their relationship to events, not <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②⑤">service worker clients</a>. Any type of synchronous requests must not be initiated inside of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤③">service worker</a>.</p>
+     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑥">ServiceWorkerGlobalScope</a></code> object represents the global execution context of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤①">service worker</a>. A <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑦">ServiceWorkerGlobalScope</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="dfn" data-noexport="" id="serviceworkerglobalscope-service-worker">service worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤②">service worker</a>). A <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑧">ServiceWorkerGlobalScope</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="dfn" data-noexport="" id="serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag">force bypass cache for importscripts flag</dfn>. It is initially unset.</p>
+     <p class="note" role="note"><span>Note:</span> <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑨">ServiceWorkerGlobalScope</a></code> object provides generic, event-driven, time-limited script execution contexts that run at an origin. Once successfully <a data-link-type="dfn" href="#register" id="ref-for-register①">registered</a>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤③">service worker</a> is started, kept alive and killed by their relationship to events, not <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②⑤">service worker clients</a>. Any type of synchronous requests must not be initiated inside of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤④">service worker</a>.</p>
      <section>
       <h4 class="heading settled" data-level="4.1.1" id="service-worker-global-scope-clients"><span class="secno">4.1.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-clients" id="ref-for-dom-serviceworkerglobalscope-clients①">clients</a></code></span><a class="self-link" href="#service-worker-global-scope-clients"></a></h4>
       <p><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="attribute" data-export="" id="dom-serviceworkerglobalscope-clients"><code>clients</code></dfn> attribute <em>must</em> return the <code class="idl"><a data-link-type="idl" href="#clients" id="ref-for-clients①">Clients</a></code> object that is associated with the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object②⓪">context object</a>.</p>
@@ -2369,7 +2377,7 @@ <h4 class="heading settled" data-level="4.1.2" id="service-worker-global-scope-r
      </section>
      <section class="algorithm" data-algorithm="service-worker-global-scope-skipwaiting">
       <h4 class="heading settled" data-level="4.1.3" id="service-worker-global-scope-skipwaiting"><span class="secno">4.1.3. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-skipwaiting" id="ref-for-dom-serviceworkerglobalscope-skipwaiting①">skipWaiting()</a></code></span><a class="self-link" href="#service-worker-global-scope-skipwaiting"></a></h4>
-      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-skipwaiting" id="ref-for-dom-serviceworkerglobalscope-skipwaiting②">skipWaiting()</a></code> method allows this <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤④">service worker</a> to progress from the <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration③">registration</a>'s <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker②">waiting</a> position to <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①④">active</a> even while <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②⑥">service worker clients</a> are <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use②">using</a> the <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration④">registration</a>.</p>
+      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-skipwaiting" id="ref-for-dom-serviceworkerglobalscope-skipwaiting②">skipWaiting()</a></code> method allows this <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑤">service worker</a> to progress from the <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration③">registration</a>'s <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker②">waiting</a> position to <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①④">active</a> even while <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②⑥">service worker clients</a> are <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use②">using</a> the <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration④">registration</a>.</p>
       <p><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="method" data-export="" id="dom-serviceworkerglobalscope-skipwaiting"><code>skipWaiting()</code></dfn> method <em>must</em> run these steps:</p>
       <ol>
        <li data-md="">
@@ -2974,7 +2982,7 @@ <h3 class="heading settled" data-level="4.4" id="extendableevent-interface"><spa
 </pre>
      <p>An <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent②">ExtendableEvent</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ExtendableEvent" data-dfn-type="dfn" data-noexport="" id="extendableevent-extend-lifetime-promises">extend lifetime promises</dfn> (an array of <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②③">promises</a>). It is initially an empty array.</p>
      <p>An <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent③">ExtendableEvent</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ExtendableEvent" data-dfn-type="dfn" data-noexport="" id="extendableevent-pending-promises-count">pending promises count</dfn> (the number of pending promises in the <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises">extend lifetime promises</a>). It is initially set to zero.</p>
-     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑤">Service workers</a> have two <a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events">lifecycle events</a>, <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-install-event" id="ref-for-service-worker-global-scope-install-event②">install</a></code> and <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-activate-event" id="ref-for-service-worker-global-scope-activate-event②">activate</a></code>. <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑥">Service workers</a> use the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent④">ExtendableEvent</a></code> interface for <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-activate-event" id="ref-for-service-worker-global-scope-activate-event③">activate</a></code> event and <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-install-event" id="ref-for-service-worker-global-scope-install-event③">install</a></code> event.</p>
+     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑥">Service workers</a> have two <a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events">lifecycle events</a>, <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-install-event" id="ref-for-service-worker-global-scope-install-event②">install</a></code> and <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-activate-event" id="ref-for-service-worker-global-scope-activate-event②">activate</a></code>. <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑦">Service workers</a> use the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent④">ExtendableEvent</a></code> interface for <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-activate-event" id="ref-for-service-worker-global-scope-activate-event③">activate</a></code> event and <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-install-event" id="ref-for-service-worker-global-scope-install-event③">install</a></code> event.</p>
      <p><a href="#extensibility">Service worker extensions</a> that <a href="#extension-to-service-worker-global-scope">define event handlers</a> <em>may</em> also use or extend the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent⑤">ExtendableEvent</a></code> interface.</p>
      <section class="algorithm" data-algorithm="wait-until-method">
       <h4 class="heading settled" data-level="4.4.1" id="wait-until-method"><span class="secno">4.4.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil①">event.waitUntil(f)</a></code></span><a class="self-link" href="#wait-until-method"></a></h4>
@@ -3004,10 +3012,10 @@ <h4 class="heading settled" data-level="4.4.1" id="wait-until-method"><span clas
           <p>If <var>registration</var> is not null, invoke <a data-link-type="dfn" href="#try-activate" id="ref-for-try-activate①">Try Activate</a> with <var>registration</var>.</p>
         </ol>
       </ol>
-      <p>The user agent <em>should not</em> <a data-link-type="dfn" href="#terminate-service-worker" id="ref-for-terminate-service-worker②">terminate</a> the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑦">service worker</a> associated with <var>event</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="ref-for-relevant-settings-object①③">relevant settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-global" id="ref-for-concept-settings-object-global①②">global object</a> when <var>event</var>’s <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#dispatch-flag" id="ref-for-dispatch-flag①">dispatch flag</a> is set or <var>event</var>’s <a data-link-type="dfn" href="#extendableevent-pending-promises-count" id="ref-for-extendableevent-pending-promises-count④">pending promises count</a> is not zero. However, the user agent <em>may</em> impose a time limit to this lifetime extension.</p>
+      <p>The user agent <em>should not</em> <a data-link-type="dfn" href="#terminate-service-worker" id="ref-for-terminate-service-worker②">terminate</a> the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑧">service worker</a> associated with <var>event</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="ref-for-relevant-settings-object①③">relevant settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-global" id="ref-for-concept-settings-object-global①②">global object</a> when <var>event</var>’s <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#dispatch-flag" id="ref-for-dispatch-flag①">dispatch flag</a> is set or <var>event</var>’s <a data-link-type="dfn" href="#extendableevent-pending-promises-count" id="ref-for-extendableevent-pending-promises-count④">pending promises count</a> is not zero. However, the user agent <em>may</em> impose a time limit to this lifetime extension.</p>
      </section>
-     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑧">Service workers</a> and <a href="#extensibility">extensions</a> that <a href="#extension-to-service-worker-global-scope">define event handlers</a> <em>may</em> define their own behaviors, allowing the <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises②">extend lifetime promises</a> to suggest operation length, and the rejected state of any of the <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②④">promise</a> in <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises③">extend lifetime promises</a> to suggest operation failure.</p>
-     <p class="note" role="note"><span>Note:</span> <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑨">Service workers</a> delay treating the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker④">installing worker</a> as <em>installed</em> until all the <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②⑤">promises</a> in the <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-install-event" id="ref-for-service-worker-global-scope-install-event④">install</a></code> event’s <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises④">extend lifetime promises</a> resolve successfully. (See the relevant <a href="#install-settle-step">Install algorithm step</a>.) If any of the promises rejects, the installation fails. This is primarily used to ensure that a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⓪">service worker</a> is not considered <em>installed</em> until all of the core caches it depends on are populated. Likewise, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥①">service workers</a> delay treating the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①⑥">active worker</a> as <em>activated</em> until all the <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②⑥">promises</a> in the <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-activate-event" id="ref-for-service-worker-global-scope-activate-event④">activate</a></code> event’s <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises⑤">extend lifetime promises</a> settle. (See the relevant <a href="#activate-settle-step">Activate algorithm step</a>.) This is primarily used to ensure that any <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①">functional events</a> are not dispatched to the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥②">service worker</a> until it upgrades database schemas and deletes the outdated cache entries.</p>
+     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑤⑨">Service workers</a> and <a href="#extensibility">extensions</a> that <a href="#extension-to-service-worker-global-scope">define event handlers</a> <em>may</em> define their own behaviors, allowing the <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises②">extend lifetime promises</a> to suggest operation length, and the rejected state of any of the <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②④">promise</a> in <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises③">extend lifetime promises</a> to suggest operation failure.</p>
+     <p class="note" role="note"><span>Note:</span> <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⓪">Service workers</a> delay treating the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker④">installing worker</a> as <em>installed</em> until all the <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②⑤">promises</a> in the <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-install-event" id="ref-for-service-worker-global-scope-install-event④">install</a></code> event’s <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises④">extend lifetime promises</a> resolve successfully. (See the relevant <a href="#install-settle-step">Install algorithm step</a>.) If any of the promises rejects, the installation fails. This is primarily used to ensure that a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥①">service worker</a> is not considered <em>installed</em> until all of the core caches it depends on are populated. Likewise, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥②">service workers</a> delay treating the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①⑥">active worker</a> as <em>activated</em> until all the <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②⑥">promises</a> in the <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-activate-event" id="ref-for-service-worker-global-scope-activate-event④">activate</a></code> event’s <a data-link-type="dfn" href="#extendableevent-extend-lifetime-promises" id="ref-for-extendableevent-extend-lifetime-promises⑤">extend lifetime promises</a> settle. (See the relevant <a href="#activate-settle-step">Activate algorithm step</a>.) This is primarily used to ensure that any <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①">functional events</a> are not dispatched to the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥③">service worker</a> until it upgrades database schemas and deletes the outdated cache entries.</p>
     </section>
     <section>
      <h3 class="heading settled" data-level="4.5" id="fetchevent-interface"><span class="secno">4.5. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#fetchevent" id="ref-for-fetchevent">FetchEvent</a></code></span><a class="self-link" href="#fetchevent-interface"></a></h3>
@@ -3028,7 +3036,7 @@ <h3 class="heading settled" data-level="4.5" id="fetchevent-interface"><span cla
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-DOMString" id="ref-for-idl-DOMString⑨"><span class="kt">DOMString</span></a> <dfn class="nv idl-code" data-default="&quot;&quot;" data-dfn-for="FetchEventInit" data-dfn-type="dict-member" data-export="" data-type="DOMString " id="dom-fetcheventinit-targetclientid"><code>targetClientId</code><a class="self-link" href="#dom-fetcheventinit-targetclientid"></a></dfn> = "";
 };
 </pre>
-     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥③">Service workers</a> have an essential <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events②">functional event</a> <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event③">fetch</a></code>. For <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event④">fetch</a></code> event, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥④">service workers</a> use the <code class="idl"><a data-link-type="idl" href="#fetchevent" id="ref-for-fetchevent①">FetchEvent</a></code> interface which extends the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent⑦">ExtendableEvent</a></code> interface.</p>
+     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥④">Service workers</a> have an essential <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events②">functional event</a> <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event③">fetch</a></code>. For <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event④">fetch</a></code> event, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑤">service workers</a> use the <code class="idl"><a data-link-type="idl" href="#fetchevent" id="ref-for-fetchevent①">FetchEvent</a></code> interface which extends the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent⑦">ExtendableEvent</a></code> interface.</p>
      <p>Each event using <code class="idl"><a data-link-type="idl" href="#fetchevent" id="ref-for-fetchevent②">FetchEvent</a></code> interface has an associated <dfn class="dfn-paneled" data-dfn-for="FetchEvent" data-dfn-type="dfn" data-noexport="" id="fetchevent-potential-response">potential response</dfn> (a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response①">response</a>), initially set to null, and the following associated flags that are initially unset:</p>
      <ul>
       <li data-md="">
@@ -3207,7 +3215,7 @@ <h3 class="heading settled" data-level="4.6" id="extendablemessageevent-interfac
   <span class="kt">sequence</span>&lt;<a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/web-messaging.html#messageport" id="ref-for-messageport⑤">MessagePort</a>> <dfn class="nv idl-code" data-default="None" data-dfn-for="ExtendableMessageEventInit" data-dfn-type="dict-member" data-export="" data-type="sequence<MessagePort> " id="dom-extendablemessageeventinit-ports"><code>ports</code><a class="self-link" href="#dom-extendablemessageeventinit-ports"></a></dfn> = [];
 };
 </pre>
-     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑤">Service workers</a> define the <a class="idl-code" data-link-type="method" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑤">extendable</a> <code class="idl"><a class="idl-code" data-link-type="event" href="#eventdef-serviceworkerglobalscope-message" id="ref-for-eventdef-serviceworkerglobalscope-message③">message</a></code> event to allow extending the lifetime of the event. For the <code class="idl"><a class="idl-code" data-link-type="event" href="#eventdef-serviceworkerglobalscope-message" id="ref-for-eventdef-serviceworkerglobalscope-message④">message</a></code> event, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑥">service workers</a> use the <code class="idl"><a data-link-type="idl" href="#extendablemessageevent" id="ref-for-extendablemessageevent②">ExtendableMessageEvent</a></code> interface which extends the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent⑨">ExtendableEvent</a></code> interface.</p>
+     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑥">Service workers</a> define the <a class="idl-code" data-link-type="method" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑤">extendable</a> <code class="idl"><a class="idl-code" data-link-type="event" href="#eventdef-serviceworkerglobalscope-message" id="ref-for-eventdef-serviceworkerglobalscope-message③">message</a></code> event to allow extending the lifetime of the event. For the <code class="idl"><a class="idl-code" data-link-type="event" href="#eventdef-serviceworkerglobalscope-message" id="ref-for-eventdef-serviceworkerglobalscope-message④">message</a></code> event, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑦">service workers</a> use the <code class="idl"><a data-link-type="idl" href="#extendablemessageevent" id="ref-for-extendablemessageevent②">ExtendableMessageEvent</a></code> interface which extends the <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent⑨">ExtendableEvent</a></code> interface.</p>
      <section>
       <h4 class="heading settled" data-level="4.6.1" id="extendablemessage-event-data"><span class="secno">4.6.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-extendablemessageevent-data" id="ref-for-dom-extendablemessageevent-data②">event.data</a></code></span><a class="self-link" href="#extendablemessage-event-data"></a></h4>
       <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ExtendableMessageEvent" data-dfn-type="attribute" data-export="" id="dom-extendablemessageevent-data"><code>data</code></dfn> attribute <em>must</em> return the value it was initialized to. When the object is created, this attribute <em>must</em> be initialized to null. It represents the message being sent.</p>
@@ -3275,7 +3283,7 @@ <h3 class="heading settled" data-level="5.1" id="cache-constructs"><span class="
     </section>
     <section>
      <h3 class="heading settled" data-level="5.2" id="cache-lifetimes"><span class="secno">5.2. </span><span class="content">Understanding Cache Lifetimes</span><a class="self-link" href="#cache-lifetimes"></a></h3>
-     <p>The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache③">Cache</a></code> instances are not part of the browser’s HTTP cache. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache④">Cache</a></code> objects are exactly what authors have to manage themselves. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache⑤">Cache</a></code> objects do not get updated unless authors explicitly request them to be. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache⑥">Cache</a></code> objects do not expire unless authors delete the entries. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache⑦">Cache</a></code> objects do not disappear just because the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑦">service worker</a> script is updated. That is, caches are not updated automatically. Updates must be manually managed. This implies that authors should version their caches by name and make sure to use the caches only from the version of the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑧">service worker</a> that can safely operate on.</p>
+     <p>The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache③">Cache</a></code> instances are not part of the browser’s HTTP cache. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache④">Cache</a></code> objects are exactly what authors have to manage themselves. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache⑤">Cache</a></code> objects do not get updated unless authors explicitly request them to be. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache⑥">Cache</a></code> objects do not expire unless authors delete the entries. The <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache⑦">Cache</a></code> objects do not disappear just because the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑧">service worker</a> script is updated. That is, caches are not updated automatically. Updates must be manually managed. This implies that authors should version their caches by name and make sure to use the caches only from the version of the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑨">service worker</a> that can safely operate on.</p>
     </section>
     <section>
      <h3 class="heading settled" data-level="5.3" id="self-caches"><span class="secno">5.3. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#global-caches-attribute" id="ref-for-global-caches-attribute">self.caches</a></code></span><a class="self-link" href="#self-caches"></a></h3>
@@ -3974,12 +3982,12 @@ <h4 class="heading settled" data-level="5.5.5" id="cache-storage-keys"><span cla
     <h2 class="heading settled" data-level="6" id="security-considerations"><span class="secno">6. </span><span class="content">Security Considerations</span><a class="self-link" href="#security-considerations"></a></h2>
     <section>
      <h3 class="heading settled" data-level="6.1" id="secure-context"><span class="secno">6.1. </span><span class="content">Secure Context</span><a class="self-link" href="#secure-context"></a></h3>
-     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑥⑨">Service workers</a> <em>must</em> execute in <a data-link-type="dfn" href="https://w3c.github.io/webappsec-secure-contexts/#secure-contexts" id="ref-for-secure-contexts③">secure contexts</a>. <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③③">Service worker clients</a> <em>must</em> also be <a data-link-type="dfn" href="https://w3c.github.io/webappsec-secure-contexts/#secure-contexts" id="ref-for-secure-contexts④">secure contexts</a> to register a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④②">service worker registration</a>, to get access to the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④③">service worker registrations</a> and the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⓪">service workers</a>, to do messaging with the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦①">service workers</a>, and to be manipulated by the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦②">service workers</a>.</p>
-     <p class="note" role="note"><span>Note:</span> This effectively means that <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦③">service workers</a> and their <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③④">service worker clients</a> need to be hosted over HTTPS. A user agent can allow <code>localhost</code> (see <a href="https://w3c.github.io/webappsec-secure-contexts/#localhost">the requirements</a>), <code>127.0.0.0/8</code>, and <code>::1/128</code> for development purposes. The primary reason for this restriction is to protect users from the <a href="https://w3c.github.io/webappsec-secure-contexts/#threat-risks">risks associated with insecure contexts</a>.</p>
+     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⓪">Service workers</a> <em>must</em> execute in <a data-link-type="dfn" href="https://w3c.github.io/webappsec-secure-contexts/#secure-contexts" id="ref-for-secure-contexts③">secure contexts</a>. <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③③">Service worker clients</a> <em>must</em> also be <a data-link-type="dfn" href="https://w3c.github.io/webappsec-secure-contexts/#secure-contexts" id="ref-for-secure-contexts④">secure contexts</a> to register a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④③">service worker registration</a>, to get access to the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④④">service worker registrations</a> and the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦①">service workers</a>, to do messaging with the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦②">service workers</a>, and to be manipulated by the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦③">service workers</a>.</p>
+     <p class="note" role="note"><span>Note:</span> This effectively means that <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦④">service workers</a> and their <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③④">service worker clients</a> need to be hosted over HTTPS. A user agent can allow <code>localhost</code> (see <a href="https://w3c.github.io/webappsec-secure-contexts/#localhost">the requirements</a>), <code>127.0.0.0/8</code>, and <code>::1/128</code> for development purposes. The primary reason for this restriction is to protect users from the <a href="https://w3c.github.io/webappsec-secure-contexts/#threat-risks">risks associated with insecure contexts</a>.</p>
     </section>
     <section>
      <h3 class="heading settled" data-level="6.2" id="content-security-policy"><span class="secno">6.2. </span><span class="content">Content Security Policy</span><a class="self-link" href="#content-security-policy"></a></h3>
-     <p>Whenever a user agent invokes <a data-link-type="dfn" href="#run-service-worker" id="ref-for-run-service-worker①">Run Service Worker</a> algorithm with a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦④">service worker</a> <var>serviceWorker</var>:</p>
+     <p>Whenever a user agent invokes <a data-link-type="dfn" href="#run-service-worker" id="ref-for-run-service-worker①">Run Service Worker</a> algorithm with a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑤">service worker</a> <var>serviceWorker</var>:</p>
      <ul>
       <li data-md="">
        <p>If <var>serviceWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource③">script resource</a> was delivered with a <code>Content-Security-Policy</code> HTTP header containing the value <var>policy</var>, the user agent <em>must</em> <a data-link-type="dfn" href="https://w3c.github.io/webappsec-csp/#enforced" id="ref-for-enforced">enforce</a> <var>policy</var> for <var>serviceWorker</var>.</p>
@@ -3993,7 +4001,7 @@ <h3 class="heading settled" data-level="6.3" id="origin-relativity"><span class=
      <section>
       <h4 class="heading settled" data-level="6.3.1" id="origin-restriction"><span class="secno">6.3.1. </span><span class="content">Origin restriction</span><a class="self-link" href="#origin-restriction"></a></h4>
       <p><em>This section is non-normative.</em></p>
-      <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑤">service worker</a> executes in the registering <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③⑤">service worker client</a>'s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin①⑥">origin</a>. One of the advanced concerns that major applications would encounter is whether they can be hosted from a CDN. By definition, these are servers in other places, often on other <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/origin.html#concept-origin" id="ref-for-concept-origin③">origins</a>. Therefore, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑥">service workers</a> cannot be hosted on CDNs. But they can include resources via <a data-link-type="functionish" href="#importscripts-method" id="ref-for-importscripts-method">importScripts()</a>. The reason for this restriction is that <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑦">service workers</a> create the opportunity for a bad actor to turn a bad day into a bad eternity.</p>
+      <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑥">service worker</a> executes in the registering <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③⑤">service worker client</a>'s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin①⑥">origin</a>. One of the advanced concerns that major applications would encounter is whether they can be hosted from a CDN. By definition, these are servers in other places, often on other <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/origin.html#concept-origin" id="ref-for-concept-origin③">origins</a>. Therefore, <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑦">service workers</a> cannot be hosted on CDNs. But they can include resources via <a data-link-type="functionish" href="#importscripts-method" id="ref-for-importscripts-method">importScripts()</a>. The reason for this restriction is that <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑧">service workers</a> create the opportunity for a bad actor to turn a bad day into a bad eternity.</p>
      </section>
      <section>
       <h4 class="heading settled" data-level="6.3.2" id="importscripts"><span class="secno">6.3.2. </span><span class="content"><code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/workers.html#dom-workerglobalscope-importscripts" id="ref-for-dom-workerglobalscope-importscripts">importScripts(urls)</a></code></span><a class="self-link" href="#importscripts"></a></h4>
@@ -4047,7 +4055,7 @@ <h4 class="heading settled" data-level="6.3.2" id="importscripts"><span class="s
     <section>
      <h3 class="heading settled" data-level="6.4" id="cross-origin-resources"><span class="secno">6.4. </span><span class="content">Cross-Origin Resources and CORS</span><a class="self-link" href="#cross-origin-resources"></a></h3>
      <p><em>This section is non-normative.</em></p>
-     <p>Applications tend to cache items that come from a CDN or other <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin①⑦">origin</a>. It is possible to request many of them directly using <code>&lt;script></code>, <code>&lt;img></code>, <code>&lt;video></code> and <code>&lt;link></code> elements. It would be hugely limiting if this sort of runtime collaboration broke when offline. Similarly, it is possible to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch⑨">fetch</a> many sorts of off-<a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin①⑧">origin</a> resources when appropriate CORS headers are set. <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑧">Service workers</a> enable this by allowing <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache①⑥">Caches</a></code> to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①⓪">fetch</a> and cache off-origin items. Some restrictions apply, however. First, unlike same-origin resources which are managed in the <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache①⑦">Cache</a></code> as <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response⑨">Response</a></code> objects whose corresponding <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-response" id="ref-for-concept-response-response④">responses</a> are <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-basic" id="ref-for-concept-filtered-response-basic">basic filtered response</a>, the objects stored are <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response①⓪">Response</a></code> objects whose corresponding <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-response" id="ref-for-concept-response-response⑤">responses</a> are either <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-cors" id="ref-for-concept-filtered-response-cors">CORS filtered responses</a> or <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque" id="ref-for-concept-filtered-response-opaque">opaque filtered responses</a>. They can be passed to <code class="idl"><a data-link-type="idl" href="#dom-fetchevent-respondwith" id="ref-for-dom-fetchevent-respondwith③">event.respondWith(r)</a></code> method in the same manner as the <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response①①">Response</a></code> objects whose corresponding <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-response" id="ref-for-concept-response-response⑥">responses</a> are <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-basic" id="ref-for-concept-filtered-response-basic①">basic filtered responses</a>, but cannot be meaningfully created programmatically. These limitations are necessary to preserve the security invariants of the platform. Allowing <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache①⑧">Caches</a></code> to store them allows applications to avoid re-architecting in most cases.</p>
+     <p>Applications tend to cache items that come from a CDN or other <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin①⑦">origin</a>. It is possible to request many of them directly using <code>&lt;script></code>, <code>&lt;img></code>, <code>&lt;video></code> and <code>&lt;link></code> elements. It would be hugely limiting if this sort of runtime collaboration broke when offline. Similarly, it is possible to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch⑨">fetch</a> many sorts of off-<a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="ref-for-concept-settings-object-origin①⑧">origin</a> resources when appropriate CORS headers are set. <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑨">Service workers</a> enable this by allowing <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache①⑥">Caches</a></code> to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①⓪">fetch</a> and cache off-origin items. Some restrictions apply, however. First, unlike same-origin resources which are managed in the <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache①⑦">Cache</a></code> as <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response⑨">Response</a></code> objects whose corresponding <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-response" id="ref-for-concept-response-response④">responses</a> are <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-basic" id="ref-for-concept-filtered-response-basic">basic filtered response</a>, the objects stored are <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response①⓪">Response</a></code> objects whose corresponding <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-response" id="ref-for-concept-response-response⑤">responses</a> are either <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-cors" id="ref-for-concept-filtered-response-cors">CORS filtered responses</a> or <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque" id="ref-for-concept-filtered-response-opaque">opaque filtered responses</a>. They can be passed to <code class="idl"><a data-link-type="idl" href="#dom-fetchevent-respondwith" id="ref-for-dom-fetchevent-respondwith③">event.respondWith(r)</a></code> method in the same manner as the <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response①①">Response</a></code> objects whose corresponding <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-response" id="ref-for-concept-response-response⑥">responses</a> are <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-basic" id="ref-for-concept-filtered-response-basic①">basic filtered responses</a>, but cannot be meaningfully created programmatically. These limitations are necessary to preserve the security invariants of the platform. Allowing <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache①⑧">Caches</a></code> to store them allows applications to avoid re-architecting in most cases.</p>
     </section>
     <section>
      <h3 class="heading settled" data-level="6.5" id="implementer-concerns"><span class="secno">6.5. </span><span class="content">Implementer Concerns</span><a class="self-link" href="#implementer-concerns"></a></h3>
@@ -4055,22 +4063,22 @@ <h3 class="heading settled" data-level="6.5" id="implementer-concerns"><span cla
      <p>The implementers are encouraged to note:</p>
      <ul>
       <li data-md="">
-       <p>Plug-ins should not load via <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑦⑨">service workers</a>. As plug-ins may get their security origins from their own urls, the embedding <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⓪">service worker</a> cannot handle it. For this reason, the <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch⑤">Handle Fetch</a> algorithm makes the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#potential-navigation-or-subresource-request" id="ref-for-potential-navigation-or-subresource-request">potential-navigation-or-subresource request</a> (whose context is either <code>&lt;embed></code> or <code>&lt;object></code>) immediately fallback to the network without dispatching <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event⑤">fetch</a></code> event.</p>
+       <p>Plug-ins should not load via <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⓪">service workers</a>. As plug-ins may get their security origins from their own urls, the embedding <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧①">service worker</a> cannot handle it. For this reason, the <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch⑤">Handle Fetch</a> algorithm makes the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#potential-navigation-or-subresource-request" id="ref-for-potential-navigation-or-subresource-request">potential-navigation-or-subresource request</a> (whose context is either <code>&lt;embed></code> or <code>&lt;object></code>) immediately fallback to the network without dispatching <code class="idl"><a class="idl-code" data-link-type="event" href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event⑤">fetch</a></code> event.</p>
       <li data-md="">
-       <p>Some of the legacy networking stack code may need to be carefully audited to understand the ramifications of interactions with <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧①">service workers</a>.</p>
+       <p>Some of the legacy networking stack code may need to be carefully audited to understand the ramifications of interactions with <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧②">service workers</a>.</p>
      </ul>
     </section>
     <section>
      <h3 class="heading settled" data-level="6.6" id="privacy"><span class="secno">6.6. </span><span class="content">Privacy</span><a class="self-link" href="#privacy"></a></h3>
-     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧②">Service workers</a> introduce new persistent storage features including <a data-link-type="dfn" href="#dfn-scope-to-registration-map" id="ref-for-dfn-scope-to-registration-map⑤">scope to registration map</a> (for <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④④">service worker registrations</a> and their <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧③">service workers</a>), <a data-link-type="dfn" href="#dfn-request-response-list" id="ref-for-dfn-request-response-list⑤">request response list</a> and <a data-link-type="dfn" href="#dfn-name-to-cache-map" id="ref-for-dfn-name-to-cache-map④">name to cache map</a> (for caches), and <a data-link-type="dfn" href="#dfn-script-resource-map" id="ref-for-dfn-script-resource-map③">script resource map</a> (for script resources). In order to protect users from any potential <a data-link-type="biblio" href="#biblio-unsanctioned-tracking">unsanctioned tracking</a> threat, these persistent storages <em>should</em> be cleared when users intend to clear them and <em>should</em> maintain and interoperate with existing user controls e.g. purging all existing persistent storages.</p>
+     <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧③">Service workers</a> introduce new persistent storage features including <a data-link-type="dfn" href="#dfn-scope-to-registration-map" id="ref-for-dfn-scope-to-registration-map⑤">scope to registration map</a> (for <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑤">service worker registrations</a> and their <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧④">service workers</a>), <a data-link-type="dfn" href="#dfn-request-response-list" id="ref-for-dfn-request-response-list⑤">request response list</a> and <a data-link-type="dfn" href="#dfn-name-to-cache-map" id="ref-for-dfn-name-to-cache-map④">name to cache map</a> (for caches), and <a data-link-type="dfn" href="#dfn-script-resource-map" id="ref-for-dfn-script-resource-map③">script resource map</a> (for script resources). In order to protect users from any potential <a data-link-type="biblio" href="#biblio-unsanctioned-tracking">unsanctioned tracking</a> threat, these persistent storages <em>should</em> be cleared when users intend to clear them and <em>should</em> maintain and interoperate with existing user controls e.g. purging all existing persistent storages.</p>
     </section>
    </section>
    <section>
     <h2 class="heading settled" data-level="7" id="extensibility"><span class="secno">7. </span><span class="content">Extensibility</span><a class="self-link" href="#extensibility"></a></h2>
-    <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧④">Service workers</a> are extensible from other specifications.</p>
+    <p><a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑤">Service workers</a> are extensible from other specifications.</p>
     <section>
      <h3 class="heading settled" data-level="7.1" id="extension-to-service-worker-registration"><span class="secno">7.1. </span><span class="content">Define API bound to Service Worker Registration</span><a class="self-link" href="#extension-to-service-worker-registration"></a></h3>
-     <p>Specifications <em>may</em> define an API tied to a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑤">service worker registration</a> by using <a data-link-type="dfn" href="https://heycam.github.io/webidl/#dfn-partial-interface" id="ref-for-dfn-partial-interface">partial interface</a> definition to the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration①⑤">ServiceWorkerRegistration</a></code> interface where it <em>may</em> define the specification specific attributes and methods:</p>
+     <p>Specifications <em>may</em> define an API tied to a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑥">service worker registration</a> by using <a data-link-type="dfn" href="https://heycam.github.io/webidl/#dfn-partial-interface" id="ref-for-dfn-partial-interface">partial interface</a> definition to the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration①⑤">ServiceWorkerRegistration</a></code> interface where it <em>may</em> define the specification specific attributes and methods:</p>
 <pre class="example idl highlight def" data-no-idl="" id="example-570ccfd8"><a class="self-link" href="#example-570ccfd8"></a><span class="kt">partial</span> <span class="kt">interface</span> <span class="nv">ServiceWorkerRegistration</span> {
   // e.g. define an API namespace
   <span class="kt">readonly</span> <span class="kt">attribute</span> <span class="n">APISpaceType</span> <span class="nv">APISpace</span>;
@@ -4098,7 +4106,7 @@ <h3 class="heading settled" data-level="7.3" id="extension-to-service-worker-glo
     </section>
     <section>
      <h3 class="heading settled" data-level="7.4" id="request-functional-event-dispatch"><span class="secno">7.4. </span><span class="content">Request Functional Event Dispatch</span><a class="self-link" href="#request-functional-event-dispatch"></a></h3>
-     <p>To request a <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑥">functional event</a> dispatch to a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑤">service worker</a>, specifications <em>may</em> invoke <a data-link-type="dfn" href="#handle-functional-event" id="ref-for-handle-functional-event">Handle Functional Event</a> algorithm with its <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑥">service worker registration</a> <var>registration</var> and the algorithm <var>callbackSteps</var> as the arguments.</p>
+     <p>To request a <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑥">functional event</a> dispatch to a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑥">service worker</a>, specifications <em>may</em> invoke <a data-link-type="dfn" href="#handle-functional-event" id="ref-for-handle-functional-event">Handle Functional Event</a> algorithm with its <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑦">service worker registration</a> <var>registration</var> and the algorithm <var>callbackSteps</var> as the arguments.</p>
      <p>Specifications <em>may</em> define an algorithm <var>callbackSteps</var> where the corresponding <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑦">functional event</a> can be created and fired with specification specific objects. The algorithm is passed <var>globalObject</var> (a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⑦">ServiceWorkerGlobalScope</a></code> object) at which it <em>may</em> fire its <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑧">functional events</a>. This algorithm is called on a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-task" id="ref-for-concept-task④">task</a> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="ref-for-queue-a-task①⑤">queued</a> by <a data-link-type="dfn" href="#handle-functional-event" id="ref-for-handle-functional-event①">Handle Functional Event</a> algorithm.</p>
      <p class="note" role="note"><span>Note:</span> See an <a href="https://notifications.spec.whatwg.org/#activating-a-notification">example</a> hook defined in <a data-link-type="biblio" href="#biblio-notifications">Notifications API</a>.</p>
     </section>
@@ -4106,8 +4114,8 @@ <h3 class="heading settled" data-level="7.4" id="request-functional-event-dispat
    <section>
     <h2 class="heading settled" id="algorithms"><span class="content">Appendix A: Algorithms</span><a class="self-link" href="#algorithms"></a></h2>
     <p>The following definitions are the user agent’s internal data structures used throughout the specification.</p>
-    <p>A <dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="dfn-scope-to-registration-map">scope to registration map</dfn> is an <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#ordered-map" id="ref-for-ordered-map②">ordered map</a> where the keys are <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⓪">scope urls</a>, <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer④">serialized</a>, and the values are <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑦">service worker registrations</a>.</p>
-    <p>A <dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="dfn-job">job</dfn> is an abstraction of one of register, update, and unregister request for a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑧">service worker registration</a>.</p>
+    <p>A <dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="dfn-scope-to-registration-map">scope to registration map</dfn> is an <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#ordered-map" id="ref-for-ordered-map②">ordered map</a> where the keys are <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⓪">scope urls</a>, <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer④">serialized</a>, and the values are <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑧">service worker registrations</a>.</p>
+    <p>A <dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="dfn-job">job</dfn> is an abstraction of one of register, update, and unregister request for a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑨">service worker registration</a>.</p>
     <div>
       A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-type">job type</dfn>, which is one of <em>register</em>, <em>update</em>, and <em>unregister</em>. 
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job①">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-scope-url">scope url</dfn> (a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url③">URL</a>).</p>
@@ -4365,7 +4373,7 @@ <h3 class="heading settled" id="register-algorithm"><span class="content"><dfn c
         <li data-md="">
          <p>Let <var>newestWorker</var> be the result of running the <a data-link-type="dfn" href="#get-newest-worker" id="ref-for-get-newest-worker①">Get Newest Worker</a> algorithm passing <var>registration</var> as the argument.</p>
         <li data-md="">
-         <p>If <var>newestWorker</var> is not null, <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals">equals</a> <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url②">script url</a> with the <em>exclude fragments flag</em> set, and <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-update-via-cache-mode" id="ref-for-dfn-job-update-via-cache-mode①">update via cache mode</a>'s value equals <var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache②">update via cache mode</a>'s value, then:</p>
+         <p>If <var>newestWorker</var> is not null, <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals">equals</a> <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url②">script url</a>, and <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-update-via-cache-mode" id="ref-for-dfn-job-update-via-cache-mode①">update via cache mode</a>'s value equals <var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache②">update via cache mode</a>'s value, then:</p>
          <ol>
           <li data-md="">
            <p>Invoke <a data-link-type="dfn" href="#resolve-job-promise" id="ref-for-resolve-job-promise">Resolve Job Promise</a> with <var>job</var> and <var>registration</var>.</p>
@@ -4407,7 +4415,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
       <li data-md="">
        <p>Let <var>newestWorker</var> be the result of running <a data-link-type="dfn" href="#get-newest-worker" id="ref-for-get-newest-worker②">Get Newest Worker</a> algorithm passing <var>registration</var> as the argument.</p>
       <li data-md="">
-       <p>If <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-type" id="ref-for-dfn-job-type⑧">job type</a> is <em>update</em>, and <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url③">script url</a> does not <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals①">equal</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url⑤">script url</a> with the <em>exclude fragments flag</em> set, then:</p>
+       <p>If <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-type" id="ref-for-dfn-job-type⑧">job type</a> is <em>update</em>, and <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url③">script url</a> does not <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals①">equal</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url⑤">script url</a>, then:</p>
        <ol>
         <li data-md="">
          <p>Invoke <a data-link-type="dfn" href="#reject-job-promise" id="ref-for-reject-job-promise④">Reject Job Promise</a> with <var>job</var> and <code>TypeError</code>.</p>
@@ -4521,7 +4529,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
        </ol>
        <p>Else, continue the rest of these steps after the algorithm’s asynchronous completion, with <var>script</var> being the asynchronous completion value.</p>
       <li data-md="">
-       <p>If <var>newestWorker</var> is not null, <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals②">equals</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url①⓪">script url</a> with the <em>exclude fragments flag</em> set, and <var>script</var>’s <a data-link-type="dfn">source text</a> is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑤">script resource</a>'s <a data-link-type="dfn">source text</a>, if <var>script</var> is a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#classic-script" id="ref-for-classic-script">classic script</a>, and <var>script</var>’s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑥">script resource</a>'s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] otherwise, then:</p>
+       <p>If <var>newestWorker</var> is not null, <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url④">script url</a> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals②">equals</a> <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url①⓪">script url</a>, and <var>script</var>’s <a data-link-type="dfn">source text</a> is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑤">script resource</a>'s <a data-link-type="dfn">source text</a>, if <var>script</var> is a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#classic-script" id="ref-for-classic-script">classic script</a>, and <var>script</var>’s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] is a byte-for-byte match with <var>newestWorker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑥">script resource</a>'s <a data-link-type="dfn">module record</a>'s [[ECMAScriptCode]] otherwise, then:</p>
        <ol>
         <li data-md="">
          <p>Invoke <a data-link-type="dfn" href="#resolve-job-promise" id="ref-for-resolve-job-promise①">Resolve Job Promise</a> with <var>job</var> and <var>registration</var>.</p>
@@ -4532,7 +4540,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
        <p>Else:</p>
        <ol>
         <li data-md="">
-         <p>Let <var>worker</var> be a new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑥">service worker</a>.</p>
+         <p>Let <var>worker</var> be a new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑦">service worker</a>.</p>
         <li data-md="">
          <p>Set <var>worker</var>’s <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url⑤">script url</a> to <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-script-url" id="ref-for-dfn-job-script-url①①">script url</a>, <var>worker</var>’s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource⑦">script resource</a> to <var>script</var>, and <var>worker</var>’s <a data-link-type="dfn" href="#dfn-type" id="ref-for-dfn-type①">type</a> to <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-worker-type" id="ref-for-dfn-job-worker-type③">worker type</a>.</p>
         <li data-md="">
@@ -4562,7 +4570,7 @@ <h3 class="heading settled" id="soft-update-algorithm"><span class="content"><df
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④⑨">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⓪">service worker registration</a></p>
       <dd data-md="">
        <p><em>force bypass cache flag</em>, an optional flag unset by default</p>
        <p class="note" role="note"><span>Note:</span> Implementers may use the <em>force bypass cache flag</em> to aid debugging (e.g. invocations from developer tools), and other specifications that extend service workers may also use the flag on their own needs.</p>
@@ -4592,9 +4600,9 @@ <h3 class="heading settled" id="installation-algorithm"><span class="content"><d
       <dd data-md="">
        <p><var>job</var>, a <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job②④">job</a></p>
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑦">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑧">service worker</a></p>
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⓪">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤①">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>none</p>
@@ -4613,7 +4621,7 @@ <h3 class="heading settled" id="installation-algorithm"><span class="content"><d
       <li data-md="">
        <p>Invoke <a data-link-type="dfn" href="#resolve-job-promise" id="ref-for-resolve-job-promise②">Resolve Job Promise</a> with <var>job</var> and <var>registration</var>.</p>
       <li data-md="">
-       <p><a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="ref-for-queue-a-task②①">Queue a task</a> to <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-fire" id="ref-for-concept-event-fire②">fire an event</a> named <code>updatefound</code> at all the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration①⑧">ServiceWorkerRegistration</a></code> objects for all the <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③⑧">service worker clients</a> whose <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-creation-url" id="ref-for-concept-environment-creation-url①⓪">creation URL</a> <a data-link-type="dfn" href="#match-service-worker-registration" id="ref-for-match-service-worker-registration⑦">matches</a> <var>registration</var>’s <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①④">scope url</a> and all the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑧">service workers</a> whose <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration①②">containing service worker registration</a> is <var>registration</var>.</p>
+       <p><a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="ref-for-queue-a-task②①">Queue a task</a> to <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-fire" id="ref-for-concept-event-fire②">fire an event</a> named <code>updatefound</code> at all the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration①⑧">ServiceWorkerRegistration</a></code> objects for all the <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client③⑧">service worker clients</a> whose <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-creation-url" id="ref-for-concept-environment-creation-url①⓪">creation URL</a> <a data-link-type="dfn" href="#match-service-worker-registration" id="ref-for-match-service-worker-registration⑦">matches</a> <var>registration</var>’s <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①④">scope url</a> and all the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑨">service workers</a> whose <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration①②">containing service worker registration</a> is <var>registration</var>.</p>
       <li data-md="">
        <p>Let <var>installingWorker</var> be <var>registration</var>’s <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker⑦">installing worker</a>.</p>
       <li data-md="">
@@ -4683,7 +4691,7 @@ <h3 class="heading settled" id="activation-algorithm"><span class="content"><dfn
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤①">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤②">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -4752,7 +4760,7 @@ <h3 class="heading settled" id="try-activate-algorithm"><span class="content"><d
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤②">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤③">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -4778,7 +4786,7 @@ <h3 class="heading settled" id="run-service-worker-algorithm"><span class="conte
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑧⑨">service worker</a></p>
+       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⓪">service worker</a></p>
       <dd data-md="">
        <p><em>force bypass cache for importscripts flag</em>, an optional flag unset by default</p>
       <dt data-md="">Output
@@ -4880,7 +4888,7 @@ <h3 class="heading settled" id="terminate-service-worker-algorithm"><span class=
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⓪">service worker</a></p>
+       <p><var>serviceWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨①">service worker</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -4903,7 +4911,7 @@ <h3 class="heading settled" id="terminate-service-worker-algorithm"><span class=
     </section>
     <section class="algorithm" data-algorithm="Handle Fetch">
      <h3 class="heading settled" id="on-fetch-request-algorithm"><span class="content"><dfn class="dfn-paneled" data-dfn-type="dfn" data-export="" id="handle-fetch">Handle Fetch</dfn></span><a class="self-link" href="#on-fetch-request-algorithm"></a></h3>
-     <p>The <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch⑥">Handle Fetch</a> algorithm is the entry point for the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①③">fetch</a> handling handed to the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨①">service worker</a> context.</p>
+     <p>The <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch⑥">Handle Fetch</a> algorithm is the entry point for the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①③">fetch</a> handling handed to the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨②">service worker</a> context.</p>
      <dl>
       <dt data-md="">Input
       <dd data-md="">
@@ -5063,7 +5071,7 @@ <h3 class="heading settled" id="handle-functional-event-algorithm"><span class="
       <dd data-md="">
        <p><var>event</var>, an <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent①⑤">ExtendableEvent</a></code> object</p>
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤③">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤④">service worker registration</a></p>
       <dd data-md="">
        <p><var>callbackSteps</var>, an algorithm</p>
       <dt data-md="">Output
@@ -5122,7 +5130,7 @@ <h3 class="heading settled" id="on-client-unload-algorithm"><span class="content
       <li data-md="">
        <p>Run the following steps atomically.</p>
       <li data-md="">
-       <p>Let <var>registration</var> be the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤④">service worker registration</a> <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use⑥">used</a> by <var>client</var>.</p>
+       <p>Let <var>registration</var> be the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑤">service worker registration</a> <a data-link-type="dfn" href="#dfn-use" id="ref-for-dfn-use⑥">used</a> by <var>client</var>.</p>
       <li data-md="">
        <p>If <var>registration</var> is null, abort these steps.</p>
       <li data-md="">
@@ -5169,7 +5177,7 @@ <h3 class="heading settled" id="update-service-worker-extended-events-set-algori
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨②">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨③">service worker</a></p>
       <dd data-md="">
        <p><var>event</var>, an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event③">event</a></p>
       <dt data-md="">Output
@@ -5239,7 +5247,7 @@ <h3 class="heading settled" id="set-registration-algorithm"><span class="content
        <p><var>updateViaCache</var>, an <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache④">update via cache mode</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑤">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑥">service worker registration</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5247,7 +5255,7 @@ <h3 class="heading settled" id="set-registration-algorithm"><span class="content
       <li data-md="">
        <p>Let <var>scopeString</var> be <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer⑨">serialized</a> <var>scope</var> with the <em>exclude fragment flag</em> set.</p>
       <li data-md="">
-       <p>Let <var>registration</var> be a new <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑥">service worker registration</a> whose <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑥">scope url</a> is set to <var>scope</var> and <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache⑤">update via cache mode</a> is set to <var>updateViaCache</var>.</p>
+       <p>Let <var>registration</var> be a new <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑦">service worker registration</a> whose <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑥">scope url</a> is set to <var>scope</var> and <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache⑤">update via cache mode</a> is set to <var>updateViaCache</var>.</p>
       <li data-md="">
        <p><a data-link-type="dfn" href="https://infra.spec.whatwg.org/#map-set" id="ref-for-map-set③">Set</a> <a data-link-type="dfn" href="#dfn-scope-to-registration-map" id="ref-for-dfn-scope-to-registration-map⑧">scope to registration map</a>[<var>scopeString</var>] to <var>registration</var>.</p>
       <li data-md="">
@@ -5259,7 +5267,7 @@ <h3 class="heading settled" id="clear-registration-algorithm"><span class="conte
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑦">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑧">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5298,7 +5306,7 @@ <h3 class="heading settled" id="clear-registration-algorithm"><span class="conte
          <p>Run the <a data-link-type="dfn" href="#update-registration-state" id="ref-for-update-registration-state⑧">Update Registration State</a> algorithm passing <var>registration</var>, "<code>active</code>" and null as the arguments.</p>
        </ol>
       <li data-md="">
-       <p>Let <var>scopeString</var> be <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer①⓪">serialized</a> <var>registration</var>’s <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑦">scope url</a> with the <em>exclude fragment flag</em> set.</p>
+       <p>Let <var>scopeString</var> be <var>registration</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer①⓪">serialized</a> <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①⑦">scope url</a>.</p>
       <li data-md="">
        <p><a data-link-type="dfn" href="https://infra.spec.whatwg.org/#map-remove" id="ref-for-map-remove①">Remove</a> <a data-link-type="dfn" href="#dfn-scope-to-registration-map" id="ref-for-dfn-scope-to-registration-map⑨">scope to registration map</a>[<var>scopeString</var>].</p>
      </ol>
@@ -5308,7 +5316,7 @@ <h3 class="heading settled" id="try-clear-registration-algorithm"><span class="c
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑧">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑨">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5331,11 +5339,11 @@ <h3 class="heading settled" id="update-registration-state-algorithm"><span class
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤⑨">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⓪">service worker registration</a></p>
       <dd data-md="">
        <p><var>target</var>, a string (one of "<code>installing</code>", "<code>waiting</code>", and "<code>active</code>")</p>
       <dd data-md="">
-       <p><var>source</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨③">service worker</a> or null</p>
+       <p><var>source</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨④">service worker</a> or null</p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5387,9 +5395,9 @@ <h3 class="heading settled" id="update-state-algorithm"><span class="content"><d
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨④">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑤">service worker</a></p>
       <dd data-md="">
-       <p><var>state</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑤">service worker</a>'s <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state①⓪">state</a></p>
+       <p><var>state</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑥">service worker</a>'s <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state①⓪">state</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>None</p>
@@ -5411,23 +5419,23 @@ <h3 class="heading settled" id="update-state-algorithm"><span class="content"><d
             <dt data-md=""><em>installing</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-installing" id="ref-for-dom-serviceworkerstate-installing">"installing"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑥">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②⓪">installing worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑥">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-oninstall" id="ref-for-dom-serviceworkerglobalscope-oninstall①">oninstall</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑧">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②①">installing worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③⓪">promise</a> resolves successfully. This is primarily used to ensure that the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑦">service worker</a> is not active until all of the core caches are populated.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑦">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②⓪">installing worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑥">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-oninstall" id="ref-for-dom-serviceworkerglobalscope-oninstall①">oninstall</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑧">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②①">installing worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③⓪">promise</a> resolves successfully. This is primarily used to ensure that the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑧">service worker</a> is not active until all of the core caches are populated.</p>
             <dt data-md=""><em>installed</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-installed" id="ref-for-dom-serviceworkerstate-installed">"installed"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑧">service worker</a> in this state is considered a <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker②①">waiting worker</a>.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑨">service worker</a> in this state is considered a <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker②①">waiting worker</a>.</p>
             <dt data-md=""><em>activating</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-activating" id="ref-for-dom-serviceworkerstate-activating">"activating"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker⑨⑨">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker④⑦">active worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑦">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-onactivate" id="ref-for-dom-serviceworkerglobalscope-onactivate①">onactivate</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑨">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker④⑧">active worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③①">promise</a> resolves successfully. No <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑨">functional events</a> are dispatched until the state becomes <em>activated</em>.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⓪">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker④⑦">active worker</a>. During this state, <code class="idl"><a data-link-type="idl" href="#dom-extendableevent-waituntil" id="ref-for-dom-extendableevent-waituntil⑦">waitUntil()</a></code> can be called inside the <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerglobalscope-onactivate" id="ref-for-dom-serviceworkerglobalscope-onactivate①">onactivate</a></code> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑨">event handler</a> to extend the life of the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker④⑧">active worker</a> until the passed <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects③①">promise</a> resolves successfully. No <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑨">functional events</a> are dispatched until the state becomes <em>activated</em>.</p>
             <dt data-md=""><em>activated</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-activated" id="ref-for-dom-serviceworkerstate-activated">"activated"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⓪">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker④⑨">active worker</a> ready to handle <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①⓪">functional events</a>.</p>
+             <p class="note" role="note"><span>Note:</span> The <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪①">service worker</a> in this state is considered an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker④⑨">active worker</a> ready to handle <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①⓪">functional events</a>.</p>
             <dt data-md=""><em>redundant</em>
             <dd data-md="">
              <p><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-redundant" id="ref-for-dom-serviceworkerstate-redundant①">"redundant"</a></code></p>
-             <p class="note" role="note"><span>Note:</span> A new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪①">service worker</a> is replacing the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪②">service worker</a>, or the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪③">service worker</a> is being discarded due to an install failure.</p>
+             <p class="note" role="note"><span>Note:</span> A new <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪②">service worker</a> is replacing the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪③">service worker</a>, or the current <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪④">service worker</a> is being discarded due to an install failure.</p>
            </dl>
           <li data-md="">
            <p><a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-fire" id="ref-for-concept-event-fire③">Fire an event</a> named <code>statechange</code> at <var>workerObject</var>.</p>
@@ -5462,7 +5470,7 @@ <h3 class="heading settled" id="scope-match-algorithm"><span class="content"><df
        <p><var>clientURL</var>, a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url⑧">URL</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥⓪">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥①">service worker registration</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5502,7 +5510,7 @@ <h3 class="heading settled" id="get-registration-algorithm"><span class="content
        <p><var>scope</var>, a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url⑨">URL</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥①">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥②">service worker registration</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5528,10 +5536,10 @@ <h3 class="heading settled" id="get-newest-worker-algorithm"><span class="conten
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥②">service worker registration</a></p>
+       <p><var>registration</var>, a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥③">service worker registration</a></p>
       <dt data-md="">Output
       <dd data-md="">
-       <p><var>newestWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪④">service worker</a></p>
+       <p><var>newestWorker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑤">service worker</a></p>
      </dl>
      <ol>
       <li data-md="">
@@ -5553,7 +5561,7 @@ <h3 class="heading settled" id="service-worker-has-no-pending-events-algorithm">
      <dl>
       <dt data-md="">Input
       <dd data-md="">
-       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑤">service worker</a></p>
+       <p><var>worker</var>, a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑥">service worker</a></p>
       <dt data-md="">Output
       <dd data-md="">
        <p>True or false, a boolean</p>
@@ -5672,7 +5680,7 @@ <h3 class="heading settled" id="query-cache-algorithm"><span class="content"><df
            <p>Set <var>requestURL</var>’s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-query" id="ref-for-concept-url-query①">query</a> to the empty string.</p>
          </ol>
         <li data-md="">
-         <p>If <var>cachedURL</var> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals③">equals</a> <var>requestURL</var> with the <em>exclude fragments flag</em> set, then:</p>
+         <p>If <var>cachedURL</var> <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-equals" id="ref-for-concept-url-equals③">equals</a> <var>requestURL</var> with the <em>exclude fragment flag</em> set, then:</p>
          <ol>
           <li data-md="">
            <p>Add a copy of <var>requestResponse</var>’s request to <var>requests</var>.</p>
@@ -5821,17 +5829,17 @@ <h3 class="heading settled" id="batch-cache-operations-algorithm"><span class="c
     <h2 class="heading settled" id="extended-http-headers"><span class="content">Appendix B: Extended HTTP headers</span><a class="self-link" href="#extended-http-headers"></a></h2>
     <section>
      <h3 class="heading settled" id="service-worker-script-request"><span class="content">Service Worker Script Request</span><a class="self-link" href="#service-worker-script-request"></a></h3>
-     <p>An HTTP request to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①④">fetch</a> a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑥">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①③">script resource</a> will include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header③">header</a>:</p>
+     <p>An HTTP request to <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-fetch" id="ref-for-concept-fetch①④">fetch</a> a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑦">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①③">script resource</a> will include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header③">header</a>:</p>
      <dl>
       <dt data-md="">`<dfn data-dfn-type="dfn" data-noexport="" id="service-worker"><code>Service-Worker</code><a class="self-link" href="#service-worker"></a></dfn>`
       <dd data-md="">
-       <p>Indicates this request is a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑦">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①④">script resource</a> request.</p>
+       <p>Indicates this request is a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑧">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①④">script resource</a> request.</p>
        <p class="note" role="note"><span>Note:</span> This header helps administrators log the requests and detect threats.</p>
      </dl>
     </section>
     <section>
      <h3 class="heading settled" id="service-worker-script-response"><span class="content">Service Worker Script Response</span><a class="self-link" href="#service-worker-script-response"></a></h3>
-     <p>An HTTP response to a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑧">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑤">script resource</a> request can include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header④">header</a>:</p>
+     <p>An HTTP response to a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑨">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑤">script resource</a> request can include the following <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-header" id="ref-for-concept-header④">header</a>:</p>
      <dl>
       <dt data-md="">`<dfn data-dfn-type="dfn" data-noexport="" id="service-worker-allowed"><code>Service-Worker-Allowed</code><a class="self-link" href="#service-worker-allowed"></a></dfn>`
       <dd data-md="">
@@ -5877,7 +5885,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
     </section>
     <section>
      <h3 class="heading settled" id="syntax"><span class="content">Syntax</span><a class="self-link" href="#syntax"></a></h3>
-     <p><a data-link-type="biblio" href="#biblio-rfc5234">ABNF</a> for the values of the headers used by the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⓪⑨">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑥">script resource</a> requests and responses:</p>
+     <p><a data-link-type="biblio" href="#biblio-rfc5234">ABNF</a> for the values of the headers used by the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①①⓪">service worker</a>'s <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①⑥">script resource</a> requests and responses:</p>
 <pre>Service-Worker = %x73.63.72.69.70.74 ; "script", case-sensitive
 </pre>
      <p class="note" role="note"><span>Note:</span> The validation of the Service-Worker-Allowed header’s values is done by URL parsing algorithm (in Update algorithm) instead of using ABNF.</p>
@@ -6624,6 +6632,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
     <a data-link-type="biblio">[URL]</a> defines the following terms:
     <ul>
      <li><a href="https://url.spec.whatwg.org/#concept-url-equals">equal</a>
+     <li><a href="https://url.spec.whatwg.org/#concept-url-fragment">fragment</a>
      <li><a href="https://url.spec.whatwg.org/#concept-url-origin">origin</a>
      <li><a href="https://url.spec.whatwg.org/#concept-url-path">path</a>
      <li><a href="https://url.spec.whatwg.org/#concept-url-query">query</a>
@@ -6935,35 +6944,36 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
     <li><a href="#ref-for-dfn-service-worker④⑤">3.2.3. active</a>
     <li><a href="#ref-for-dfn-service-worker④⑥">3.4. ServiceWorkerContainer</a>
     <li><a href="#ref-for-dfn-service-worker④⑦">3.4.1. controller</a>
-    <li><a href="#ref-for-dfn-service-worker④⑧">3.5. Events</a> <a href="#ref-for-dfn-service-worker④⑨">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑤⓪">4.1. ServiceWorkerGlobalScope</a> <a href="#ref-for-dfn-service-worker⑤①">(2)</a> <a href="#ref-for-dfn-service-worker⑤②">(3)</a> <a href="#ref-for-dfn-service-worker⑤③">(4)</a>
-    <li><a href="#ref-for-dfn-service-worker⑤④">4.1.3. skipWaiting()</a>
-    <li><a href="#ref-for-dfn-service-worker⑤⑤">4.4. ExtendableEvent</a> <a href="#ref-for-dfn-service-worker⑤⑥">(2)</a> <a href="#ref-for-dfn-service-worker⑤⑧">(3)</a> <a href="#ref-for-dfn-service-worker⑤⑨">(4)</a> <a href="#ref-for-dfn-service-worker⑥⓪">(5)</a> <a href="#ref-for-dfn-service-worker⑥①">(6)</a> <a href="#ref-for-dfn-service-worker⑥②">(7)</a>
-    <li><a href="#ref-for-dfn-service-worker⑤⑦">4.4.1. event.waitUntil(f)</a>
-    <li><a href="#ref-for-dfn-service-worker⑥③">4.5. FetchEvent</a> <a href="#ref-for-dfn-service-worker⑥④">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑥⑤">4.6. ExtendableMessageEvent</a> <a href="#ref-for-dfn-service-worker⑥⑥">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑥⑦">5.2. Understanding Cache Lifetimes</a> <a href="#ref-for-dfn-service-worker⑥⑧">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑥⑨">6.1. Secure Context</a> <a href="#ref-for-dfn-service-worker⑦⓪">(2)</a> <a href="#ref-for-dfn-service-worker⑦①">(3)</a> <a href="#ref-for-dfn-service-worker⑦②">(4)</a> <a href="#ref-for-dfn-service-worker⑦③">(5)</a>
-    <li><a href="#ref-for-dfn-service-worker⑦④">6.2. Content Security Policy</a>
-    <li><a href="#ref-for-dfn-service-worker⑦⑤">6.3.1. Origin restriction</a> <a href="#ref-for-dfn-service-worker⑦⑥">(2)</a> <a href="#ref-for-dfn-service-worker⑦⑦">(3)</a>
-    <li><a href="#ref-for-dfn-service-worker⑦⑧">6.4. Cross-Origin Resources and CORS</a>
-    <li><a href="#ref-for-dfn-service-worker⑦⑨">6.5. Implementer Concerns</a> <a href="#ref-for-dfn-service-worker⑧⓪">(2)</a> <a href="#ref-for-dfn-service-worker⑧①">(3)</a>
-    <li><a href="#ref-for-dfn-service-worker⑧②">6.6. Privacy</a> <a href="#ref-for-dfn-service-worker⑧③">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑧④">7. Extensibility</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑤">7.4. Request Functional Event Dispatch</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑥">Update</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑦">Install</a> <a href="#ref-for-dfn-service-worker⑧⑧">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker⑧⑨">Run Service Worker</a>
-    <li><a href="#ref-for-dfn-service-worker⑨⓪">Terminate Service Worker</a>
-    <li><a href="#ref-for-dfn-service-worker⑨①">Handle Fetch</a>
-    <li><a href="#ref-for-dfn-service-worker⑨②">Update Service Worker Extended Events Set</a>
-    <li><a href="#ref-for-dfn-service-worker⑨③">Update Registration State</a>
-    <li><a href="#ref-for-dfn-service-worker⑨④">Update Worker State</a> <a href="#ref-for-dfn-service-worker⑨⑤">(2)</a> <a href="#ref-for-dfn-service-worker⑨⑥">(3)</a> <a href="#ref-for-dfn-service-worker⑨⑦">(4)</a> <a href="#ref-for-dfn-service-worker⑨⑧">(5)</a> <a href="#ref-for-dfn-service-worker⑨⑨">(6)</a> <a href="#ref-for-dfn-service-worker①⓪⓪">(7)</a> <a href="#ref-for-dfn-service-worker①⓪①">(8)</a> <a href="#ref-for-dfn-service-worker①⓪②">(9)</a> <a href="#ref-for-dfn-service-worker①⓪③">(10)</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪④">Get Newest Worker</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑤">Service Worker Has No Pending Events</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑥">Service Worker Script Request</a> <a href="#ref-for-dfn-service-worker①⓪⑦">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑧">Service Worker Script Response</a>
-    <li><a href="#ref-for-dfn-service-worker①⓪⑨">Syntax</a>
+    <li><a href="#ref-for-dfn-service-worker④⑧">3.4.3. register(scriptURL, options)</a>
+    <li><a href="#ref-for-dfn-service-worker④⑨">3.5. Events</a> <a href="#ref-for-dfn-service-worker⑤⓪">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑤①">4.1. ServiceWorkerGlobalScope</a> <a href="#ref-for-dfn-service-worker⑤②">(2)</a> <a href="#ref-for-dfn-service-worker⑤③">(3)</a> <a href="#ref-for-dfn-service-worker⑤④">(4)</a>
+    <li><a href="#ref-for-dfn-service-worker⑤⑤">4.1.3. skipWaiting()</a>
+    <li><a href="#ref-for-dfn-service-worker⑤⑥">4.4. ExtendableEvent</a> <a href="#ref-for-dfn-service-worker⑤⑦">(2)</a> <a href="#ref-for-dfn-service-worker⑤⑨">(3)</a> <a href="#ref-for-dfn-service-worker⑥⓪">(4)</a> <a href="#ref-for-dfn-service-worker⑥①">(5)</a> <a href="#ref-for-dfn-service-worker⑥②">(6)</a> <a href="#ref-for-dfn-service-worker⑥③">(7)</a>
+    <li><a href="#ref-for-dfn-service-worker⑤⑧">4.4.1. event.waitUntil(f)</a>
+    <li><a href="#ref-for-dfn-service-worker⑥④">4.5. FetchEvent</a> <a href="#ref-for-dfn-service-worker⑥⑤">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑥⑥">4.6. ExtendableMessageEvent</a> <a href="#ref-for-dfn-service-worker⑥⑦">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑥⑧">5.2. Understanding Cache Lifetimes</a> <a href="#ref-for-dfn-service-worker⑥⑨">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑦⓪">6.1. Secure Context</a> <a href="#ref-for-dfn-service-worker⑦①">(2)</a> <a href="#ref-for-dfn-service-worker⑦②">(3)</a> <a href="#ref-for-dfn-service-worker⑦③">(4)</a> <a href="#ref-for-dfn-service-worker⑦④">(5)</a>
+    <li><a href="#ref-for-dfn-service-worker⑦⑤">6.2. Content Security Policy</a>
+    <li><a href="#ref-for-dfn-service-worker⑦⑥">6.3.1. Origin restriction</a> <a href="#ref-for-dfn-service-worker⑦⑦">(2)</a> <a href="#ref-for-dfn-service-worker⑦⑧">(3)</a>
+    <li><a href="#ref-for-dfn-service-worker⑦⑨">6.4. Cross-Origin Resources and CORS</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⓪">6.5. Implementer Concerns</a> <a href="#ref-for-dfn-service-worker⑧①">(2)</a> <a href="#ref-for-dfn-service-worker⑧②">(3)</a>
+    <li><a href="#ref-for-dfn-service-worker⑧③">6.6. Privacy</a> <a href="#ref-for-dfn-service-worker⑧④">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑤">7. Extensibility</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑥">7.4. Request Functional Event Dispatch</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑦">Update</a>
+    <li><a href="#ref-for-dfn-service-worker⑧⑧">Install</a> <a href="#ref-for-dfn-service-worker⑧⑨">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker⑨⓪">Run Service Worker</a>
+    <li><a href="#ref-for-dfn-service-worker⑨①">Terminate Service Worker</a>
+    <li><a href="#ref-for-dfn-service-worker⑨②">Handle Fetch</a>
+    <li><a href="#ref-for-dfn-service-worker⑨③">Update Service Worker Extended Events Set</a>
+    <li><a href="#ref-for-dfn-service-worker⑨④">Update Registration State</a>
+    <li><a href="#ref-for-dfn-service-worker⑨⑤">Update Worker State</a> <a href="#ref-for-dfn-service-worker⑨⑥">(2)</a> <a href="#ref-for-dfn-service-worker⑨⑦">(3)</a> <a href="#ref-for-dfn-service-worker⑨⑧">(4)</a> <a href="#ref-for-dfn-service-worker⑨⑨">(5)</a> <a href="#ref-for-dfn-service-worker①⓪⓪">(6)</a> <a href="#ref-for-dfn-service-worker①⓪①">(7)</a> <a href="#ref-for-dfn-service-worker①⓪②">(8)</a> <a href="#ref-for-dfn-service-worker①⓪③">(9)</a> <a href="#ref-for-dfn-service-worker①⓪④">(10)</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑤">Get Newest Worker</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑥">Service Worker Has No Pending Events</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑦">Service Worker Script Request</a> <a href="#ref-for-dfn-service-worker①⓪⑧">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker①⓪⑨">Service Worker Script Response</a>
+    <li><a href="#ref-for-dfn-service-worker①①⓪">Syntax</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="dfn-state">
@@ -7129,26 +7139,26 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
     <li><a href="#ref-for-dfn-service-worker-registration③③">3.2.7. unregister()</a> <a href="#ref-for-dfn-service-worker-registration③④">(2)</a>
     <li><a href="#ref-for-dfn-service-worker-registration③⑤">3.4. ServiceWorkerContainer</a> <a href="#ref-for-dfn-service-worker-registration③⑥">(2)</a>
     <li><a href="#ref-for-dfn-service-worker-registration③⑦">3.4.2. ready</a>
-    <li><a href="#ref-for-dfn-service-worker-registration③⑧">3.4.3. register(scriptURL, options)</a> <a href="#ref-for-dfn-service-worker-registration③⑨">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④⓪">3.5. Events</a> <a href="#ref-for-dfn-service-worker-registration④①">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④②">6.1. Secure Context</a> <a href="#ref-for-dfn-service-worker-registration④③">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④④">6.6. Privacy</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④⑤">7.1. Define API bound to Service Worker Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④⑥">7.4. Request Functional Event Dispatch</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④⑦">Appendix A: Algorithms</a> <a href="#ref-for-dfn-service-worker-registration④⑧">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration④⑨">Soft Update</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⓪">Install</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤①">Activate</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤②">Try Activate</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤③">Handle Functional Event</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤④">Handle Service Worker Client Unload</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑤">Set Registration</a> <a href="#ref-for-dfn-service-worker-registration⑤⑥">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑦">Clear Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑧">Try Clear Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑤⑨">Update Registration State</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥⓪">Match Service Worker Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥①">Get Registration</a>
-    <li><a href="#ref-for-dfn-service-worker-registration⑥②">Get Newest Worker</a>
+    <li><a href="#ref-for-dfn-service-worker-registration③⑧">3.4.3. register(scriptURL, options)</a> <a href="#ref-for-dfn-service-worker-registration③⑨">(2)</a> <a href="#ref-for-dfn-service-worker-registration④⓪">(3)</a>
+    <li><a href="#ref-for-dfn-service-worker-registration④①">3.5. Events</a> <a href="#ref-for-dfn-service-worker-registration④②">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker-registration④③">6.1. Secure Context</a> <a href="#ref-for-dfn-service-worker-registration④④">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker-registration④⑤">6.6. Privacy</a>
+    <li><a href="#ref-for-dfn-service-worker-registration④⑥">7.1. Define API bound to Service Worker Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration④⑦">7.4. Request Functional Event Dispatch</a>
+    <li><a href="#ref-for-dfn-service-worker-registration④⑧">Appendix A: Algorithms</a> <a href="#ref-for-dfn-service-worker-registration④⑨">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⓪">Soft Update</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤①">Install</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤②">Activate</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤③">Try Activate</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤④">Handle Functional Event</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑤">Handle Service Worker Client Unload</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑥">Set Registration</a> <a href="#ref-for-dfn-service-worker-registration⑤⑦">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑧">Clear Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑤⑨">Try Clear Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥⓪">Update Registration State</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥①">Match Service Worker Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥②">Get Registration</a>
+    <li><a href="#ref-for-dfn-service-worker-registration⑥③">Get Newest Worker</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="dfn-scope-url">