diff --git a/docs/index.html b/docs/index.html
index 40d150de..24c46d8f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1212,9 +1212,9 @@
 	}
 </style>
   <link href="https://www.w3.org/StyleSheets/TR/2016/W3C-ED" rel="stylesheet" type="text/css">
-  <meta content="Bikeshed version 6d3a750812441328ea98d66fac577c3ced988303" name="generator">
+  <meta content="Bikeshed version eba8d1c24624e5fc4844dca1b87307d13888e633" name="generator">
   <link href="https://www.w3.org/TR/service-workers/" rel="canonical">
-  <meta content="cca62e622066c1f72a8033d0298a9de391bb48c2" name="document-revision">
+  <meta content="19bac0569e241223df624841afe838074712cf5a" name="document-revision">
 <style>/* style-md-lists */
 
 /* This is a weird hack for me not yet following the commonmark spec
@@ -1472,7 +1472,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="2018-06-13">13 June 2018</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="2018-06-15">15 June 2018</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -1526,6 +1526,7 @@ <h2 class="no-num no-toc no-ref" id="contents">Table of Contents</h2>
        <a href="#service-worker-concept"><span class="secno">2.1</span> <span class="content">Service Worker</span></a>
        <ol class="toc">
         <li><a href="#service-worker-lifetime"><span class="secno">2.1.1</span> <span class="content">Lifetime</span></a>
+        <li><a href="#service-worker-events"><span class="secno">2.1.2</span> <span class="content">Events</span></a>
        </ol>
       <li>
        <a href="#service-worker-registration-concept"><span class="secno">2.2</span> <span class="content">Service Worker Registration</span></a>
@@ -1785,20 +1786,19 @@ <h3 class="heading settled" data-level="2.1" id="service-worker-concept"><span c
      <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⑦">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-type">type</dfn> which is either "<code>classic</code>" or "<code>module</code>". Unless stated otherwise, it is "<code>classic</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⑧">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" data-lt="registration|containing service worker registration" id="dfn-containing-service-worker-registration">containing service worker registration</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration">service worker registration</a>), which contains itself.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker①⑨">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-service-worker-global-object">global object</dfn> (a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope">ServiceWorkerGlobalScope</a></code> object or null).</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⓪">service worker</a> has <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-lifecycle-events">lifecycle events</dfn>, <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>, and <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-functional-events">functional events</dfn> including <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>, which target the <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①">ServiceWorkerGlobalScope</a></code>.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②①">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-script-resource">script resource</dfn> (a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-script" id="ref-for-concept-script">script</a>), which represents its own script resource. It is initially set to null.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⓪">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-script-resource">script resource</dfn> (a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-script" id="ref-for-concept-script">script</a>), which represents its own script resource. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource">script resource</a> has an associated <dfn class="dfn-paneled" data-dfn-for="script resource" data-dfn-type="dfn" data-export="" id="dfn-has-ever-been-evaluated-flag">has ever been evaluated flag</dfn>. It is initially unset.</p>
      <p>A <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource①">script resource</a> has an associated <dfn class="dfn-paneled" data-dfn-for="script resource" data-dfn-type="dfn" data-export="" id="dfn-https-state">HTTPS state</dfn> (an <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-https-state-value" id="ref-for-concept-https-state-value">HTTPS state value</a>). It is initially "<code>none</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-script-resource" id="ref-for-dfn-script-resource②">script resource</a> has an associated <dfn class="dfn-paneled" data-dfn-for="script resource" data-dfn-type="dfn" data-export="" id="dfn-referrer-policy">referrer policy</dfn> (a <a data-link-type="dfn" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy" id="ref-for-referrer-policy">referrer policy</a>). It is initially the empty string.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②②">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-script-resource-map">script resource map</dfn> which 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="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url①">URLs</a> and the values are <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response">responses</a>.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②③">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-skip-waiting-flag">skip waiting flag</dfn>. Unless stated otherwise it is unset.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②④">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-classic-scripts-imported-flag">classic scripts imported flag</dfn>. It is initially unset.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑤">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-set-of-event-types-to-handle">set of event types to handle</dfn> (a <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#ordered-set" id="ref-for-ordered-set">set</a>) whose <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#list-item" id="ref-for-list-item">item</a> is an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-listener" id="ref-for-concept-event-listener">event listener</a>’s event type. It is initially an empty set.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑥">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-set-of-extended-events">set of extended events</dfn> (a <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#ordered-set" id="ref-for-ordered-set①">set</a>) whose <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#list-item" id="ref-for-list-item①">item</a> is an <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent">ExtendableEvent</a></code>. It is initially an empty set.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②①">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-script-resource-map">script resource map</dfn> which 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="https://url.spec.whatwg.org/#concept-url" id="ref-for-concept-url①">URLs</a> and the values are <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response">responses</a>.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②②">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-skip-waiting-flag">skip waiting flag</dfn>. Unless stated otherwise it is unset.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②③">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-classic-scripts-imported-flag">classic scripts imported flag</dfn>. It is initially unset.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②④">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-set-of-event-types-to-handle">set of event types to handle</dfn> (a <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#ordered-set" id="ref-for-ordered-set">set</a>) whose <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#list-item" id="ref-for-list-item">item</a> is an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-listener" id="ref-for-concept-event-listener">event listener</a>’s event type. It is initially an empty set.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑤">service worker</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-set-of-extended-events">set of extended events</dfn> (a <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#ordered-set" id="ref-for-ordered-set①">set</a>) whose <a data-link-type="dfn" href="https://infra.spec.whatwg.org/#list-item" id="ref-for-list-item①">item</a> is an <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent">ExtendableEvent</a></code>. It is initially an empty set.</p>
      <section>
       <h4 class="heading settled" data-level="2.1.1" id="service-worker-lifetime"><span class="secno">2.1.1. </span><span class="content">Lifetime</span><a class="self-link" href="#service-worker-lifetime"></a></h4>
-      <p>The lifetime of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑦">service worker</a> is tied to the execution lifetime of events and not references held by <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client①">service worker clients</a> to the <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker">ServiceWorker</a></code> object.</p>
-      <p>A user agent <em>may</em> <a data-link-type="dfn" href="#terminate-service-worker" id="ref-for-terminate-service-worker">terminate</a> <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑧">service workers</a> at any time it:</p>
+      <p>The lifetime of a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑥">service worker</a> is tied to the execution lifetime of events and not references held by <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client①">service worker clients</a> to the <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker">ServiceWorker</a></code> object.</p>
+      <p>A user agent <em>may</em> <a data-link-type="dfn" href="#terminate-service-worker" id="ref-for-terminate-service-worker">terminate</a> <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑦">service workers</a> at any time it:</p>
       <ul>
        <li data-md="">
         <p>Has no event to handle.</p>
@@ -1806,14 +1806,18 @@ <h4 class="heading settled" data-level="2.1.1" id="service-worker-lifetime"><spa
         <p>Detects abnormal operation: such as infinite loops and tasks exceeding imposed time limits (if any) while handling the events.</p>
       </ul>
      </section>
+     <section>
+      <h4 class="heading settled" data-level="2.1.2" id="service-worker-events"><span class="secno">2.1.2. </span><span class="content">Events</span><a class="self-link" href="#service-worker-events"></a></h4>
+      <p>Service Workers specification defines <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-lifecycle-events">lifecycle events</dfn> (each of which is an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event">event</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>. Service Workers and other specifications that <a href="#extensibility">extend</a> Service Workers define set of events called <dfn class="dfn-paneled" data-dfn-for="service worker" data-dfn-type="dfn" data-export="" id="dfn-functional-events">functional events</dfn> (each of which is an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event①">event</a>) including <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>. (See the <a href="#execution-context-events">list</a> of <a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events">lifecycle events</a> and <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events">functional events</a>.)</p>
+     </section>
     </section>
     <section>
      <h3 class="heading settled" data-level="2.2" id="service-worker-registration-concept"><span class="secno">2.2. </span><span class="content">Service Worker Registration</span><a class="self-link" href="#service-worker-registration-concept"></a></h3>
-     <p>A <dfn class="dfn-paneled" data-dfn-for="" data-dfn-type="dfn" data-export="" id="dfn-service-worker-registration">service worker registration</dfn> is a tuple of a <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url">scope url</a> and a set of <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑨">service workers</a>, an <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker">installing worker</a>, a <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker">waiting worker</a>, and an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker">active worker</a>. A user agent <em>may</em> enable many <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration①">service worker registrations</a> at a single origin so long as the <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①">scope url</a> of the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration②">service worker registration</a> differs. A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③">service worker registration</a> of an identical <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url②">scope url</a> when one already exists in the user agent causes the existing <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④">service worker registration</a> to be replaced.</p>
+     <p>A <dfn class="dfn-paneled" data-dfn-for="" data-dfn-type="dfn" data-export="" id="dfn-service-worker-registration">service worker registration</dfn> is a tuple of a <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url">scope url</a> and a set of <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑧">service workers</a>, an <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker">installing worker</a>, a <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker">waiting worker</a>, and an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker">active worker</a>. A user agent <em>may</em> enable many <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration①">service worker registrations</a> at a single origin so long as the <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url①">scope url</a> of the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration②">service worker registration</a> differs. A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③">service worker registration</a> of an identical <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url②">scope url</a> when one already exists in the user agent causes the existing <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration④">service worker registration</a> to be replaced.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑤">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-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>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-installing-worker">installing worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⓪">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state">state</a> is <em>installing</em>. It is initially set to null.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑦">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-waiting-worker">waiting worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③①">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state①">state</a> is <em>installed</em>. It is initially set to null.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑧">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-active-worker">active worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③②">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state②">state</a> is either <em>activating</em> or <em>activated</em>. It is initially set to null.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑥">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-installing-worker">installing worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker②⑨">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state">state</a> is <em>installing</em>. It is initially set to null.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑦">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-waiting-worker">waiting worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⓪">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state①">state</a> is <em>installed</em>. It is initially set to null.</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑧">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-active-worker">active worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③①">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state②">state</a> is either <em>activating</em> or <em>activated</em>. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration⑨">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-last-update-check-time">last update check time</dfn>. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration①⓪">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-update-via-cache">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>none</code>". It is initially set to "<code>imports</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration①①">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-uninstalling-flag">uninstalling flag</dfn>. It is initially unset.</p>
@@ -1851,14 +1855,14 @@ <h3 class="heading settled" data-level="2.4" id="selection"><span class="secno">
     </section>
     <section>
      <h3 class="heading settled" data-level="2.5" id="task-sources"><span class="secno">2.5. </span><span class="content">Task Sources</span><a class="self-link" href="#task-sources"></a></h3>
-     <p>The following additional <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source">task sources</a> are used by <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③③">service workers</a>.</p>
+     <p>The following additional <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source">task sources</a> are used by <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③②">service workers</a>.</p>
      <dl>
       <dt data-md="">The <dfn class="dfn-paneled" data-dfn-type="dfn" data-export="" id="dfn-handle-fetch-task-source">handle fetch task source</dfn>
       <dd data-md="">
-       <p>This <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source①">task source</a> is used for <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-dispatch" id="ref-for-concept-event-dispatch">dispatching</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> events to <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③④">service workers</a>.</p>
+       <p>This <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source①">task source</a> is used for <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-dispatch" id="ref-for-concept-event-dispatch">dispatching</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> events to <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③③">service workers</a>.</p>
       <dt data-md="">The <dfn class="dfn-paneled" data-dfn-type="dfn" data-export="" id="dfn-handle-functional-event-task-source">handle functional event task source</dfn>
       <dd data-md="">
-       <p>This <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source②">task source</a> is used for features that <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-dispatch" id="ref-for-concept-event-dispatch①">dispatch</a> other <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events">functional events</a>, e.g. <code class="idl"><a class="idl-code" data-link-type="event" href="https://w3c.github.io/push-api/#h-the-push-event" id="ref-for-h-the-push-event">push</a></code> events, to <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑤">service workers</a>.</p>
+       <p>This <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source②">task source</a> is used for features that <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-dispatch" id="ref-for-concept-event-dispatch①">dispatch</a> other <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①">functional events</a>, e.g. <code class="idl"><a class="idl-code" data-link-type="event" href="https://w3c.github.io/push-api/#h-the-push-event" id="ref-for-h-the-push-event">push</a></code> events, to <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> A user agent may use a separate task source for each functional event type in order to avoid a head-of-line blocking phenomenon for certain functional events.</p>
      </dl>
     </section>
@@ -1867,7 +1871,7 @@ <h3 class="heading settled" data-level="2.6" id="user-agent-shutdown"><span clas
      <p>A user agent <em>must</em> maintain the state of its stored <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③⓪">service worker registrations</a> across restarts with the following rules:</p>
      <ul>
       <li data-md="">
-       <p>An <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker①">installing worker</a> does not persist but is discarded. If the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②">installing worker</a> was the only <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑥">service worker</a> for the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③①">service worker registration</a>, the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③②">service worker registration</a> is discarded.</p>
+       <p>An <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker①">installing worker</a> does not persist but is discarded. If the <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker②">installing worker</a> was the only <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑤">service worker</a> for the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③①">service worker registration</a>, the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③②">service worker registration</a> is discarded.</p>
       <li data-md="">
        <p>A <a data-link-type="dfn" href="#dfn-waiting-worker" id="ref-for-dfn-waiting-worker①">waiting worker</a> promotes to an <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker⑨">active worker</a>.</p>
      </ul>
@@ -1911,11 +1915,11 @@ <h3 class="heading settled" data-level="3.1" id="serviceworker-interface"><span
   <dfn class="s dfn-paneled idl-code" data-dfn-for="ServiceWorkerState" data-dfn-type="enum-value" data-export="" id="dom-serviceworkerstate-redundant"><code>"redundant"</code></dfn>
 };
 </pre>
-     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker③">ServiceWorker</a></code> object represents a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑦">service worker</a>. Each <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker④">ServiceWorker</a></code> object is associated with a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑧">service worker</a>. Multiple separate objects implementing the <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker⑤">ServiceWorker</a></code> interface across documents and workers can all be associated with the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑨">service worker</a> simultaneously.</p>
-     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker⑥">ServiceWorker</a></code> object has an associated <code class="idl"><a data-link-type="idl" href="#enumdef-serviceworkerstate" id="ref-for-enumdef-serviceworkerstate①">ServiceWorkerState</a></code> object which is itself associated with <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>A <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker③">ServiceWorker</a></code> object represents a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑥">service worker</a>. Each <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker④">ServiceWorker</a></code> object is associated with a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑦">service worker</a>. Multiple separate objects implementing the <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker⑤">ServiceWorker</a></code> interface across documents and workers can all be associated with the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker③⑧">service worker</a> simultaneously.</p>
+     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker⑥">ServiceWorker</a></code> object has an associated <code class="idl"><a data-link-type="idl" href="#enumdef-serviceworkerstate" id="ref-for-enumdef-serviceworkerstate①">ServiceWorkerState</a></code> object which is itself associated with <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>
      <section>
       <h4 class="heading settled" data-level="3.1.1" id="service-worker-url"><span class="secno">3.1.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworker-scripturl" id="ref-for-dom-serviceworker-scripturl①">scriptURL</a></code></span><a class="self-link" href="#service-worker-url"></a></h4>
-      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorker" data-dfn-type="attribute" data-export="" id="dom-serviceworker-scripturl"><code>scriptURL</code></dfn> attribute <em>must</em> return 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="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer①">serialized</a> <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url">script url</a>.</p>
+      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorker" data-dfn-type="attribute" data-export="" id="dom-serviceworker-scripturl"><code>scriptURL</code></dfn> attribute <em>must</em> return 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="https://url.spec.whatwg.org/#concept-url-serializer" id="ref-for-concept-url-serializer①">serialized</a> <a data-link-type="dfn" href="#dfn-script-url" id="ref-for-dfn-script-url">script url</a>.</p>
       <div class="example" id="example-afd15a33">
        <a class="self-link" href="#example-afd15a33"></a> For example, consider a document created by a navigation to <code>https://example.com/app.html</code> which <a data-link-type="dfn" href="#match-service-worker-registration" id="ref-for-match-service-worker-registration③">matches</a> via the following registration call which has been previously executed: 
 <pre class="highlight"><span class="c1">// Script on the page https://example.com/app.html</span>
@@ -1935,7 +1939,7 @@ <h4 class="heading settled" data-level="3.1.3" id="service-worker-postmessage"><
        <li data-md="">
         <p>If the <code class="idl"><a data-link-type="idl" href="#dom-serviceworker-state" id="ref-for-dom-serviceworker-state②">state</a></code> attribute value of the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object">context object</a> is <code class="idl"><a data-link-type="idl" href="#dom-serviceworkerstate-redundant" id="ref-for-dom-serviceworkerstate-redundant">"redundant"</a></code>, <a data-link-type="dfn" href="https://heycam.github.io/webidl/#dfn-throw" id="ref-for-dfn-throw">throw</a> an "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#invalidstateerror" id="ref-for-invalidstateerror">InvalidStateError</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="">
-        <p>Let <var>serviceWorker</var> be the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④②">service worker</a> represented by the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object①">context object</a>.</p>
+        <p>Let <var>serviceWorker</var> be the <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④①">service worker</a> represented by the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object" id="ref-for-context-object①">context object</a>.</p>
        <li data-md="">
         <p>Invoke <a data-link-type="dfn" href="#run-service-worker" id="ref-for-run-service-worker">Run Service Worker</a> algorithm with <var>serviceWorker</var> as the argument.</p>
        <li data-md="">
@@ -1948,7 +1952,7 @@ <h4 class="heading settled" data-level="3.1.3" id="service-worker-postmessage"><
          <li data-md="">
           <p>Let <var>source</var> be determined by switching on the type of <var>incumbentGlobal</var>:</p>
           <dl class="switch">
-           <dt><code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope②">ServiceWorkerGlobalScope</a></code>
+           <dt><code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①">ServiceWorkerGlobalScope</a></code>
            <dd>a new <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker⑦">ServiceWorker</a></code> object that represents <var>incumbentGlobal</var>’s <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker">service worker</a>.
            <dt><code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/window-object.html#window" id="ref-for-window①">Window</a></code>
            <dd>a new <code class="idl"><a data-link-type="idl" href="#windowclient" id="ref-for-windowclient">WindowClient</a></code> object that represents <var>incumbentGlobal</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>.
@@ -1958,7 +1962,7 @@ <h4 class="heading settled" data-level="3.1.3" id="service-worker-postmessage"><
          <li data-md="">
           <p>Let <var>origin</var> be the <a data-link-type="dfn">Unicode serialization</a> of <var>incumbentSettings</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>.</p>
          <li data-md="">
-          <p>Let <var>destination</var> be the <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope③">ServiceWorkerGlobalScope</a></code> object associated with <var>serviceWorker</var>.</p>
+          <p>Let <var>destination</var> be the <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope②">ServiceWorkerGlobalScope</a></code> object associated with <var>serviceWorker</var>.</p>
          <li data-md="">
           <p>Let <var>deserializeRecord</var> be <a data-link-type="abstract-op" href="https://html.spec.whatwg.org/multipage/structured-data.html#structureddeserializewithtransfer" id="ref-for-structureddeserializewithtransfer">StructuredDeserializeWithTransfer</a>(<var>serializeWithTransferResult</var>, <var>destination</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-global-object-realm" id="ref-for-concept-global-object-realm">Realm</a>).</p>
           <p>If this throws an exception, catch it, <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 class="idl"><a class="idl-code" data-link-type="event" href="#eventdef-serviceworkerglobalscope-messageerror" id="ref-for-eventdef-serviceworkerglobalscope-messageerror">messageerror</a></code> at <var>destination</var>, using <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/comms.html#messageevent" id="ref-for-messageevent">MessageEvent</a></code>, with the <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/comms.html#dom-messageevent-origin" id="ref-for-dom-messageevent-origin">origin</a></code> attribute initialized to <var>origin</var> and the <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/comms.html#dom-messageevent-source" id="ref-for-dom-messageevent-source">source</a></code> attribute initialized to <var>source</var>, and then abort these steps.</p>
@@ -2019,17 +2023,17 @@ <h3 class="heading settled" data-level="3.2" id="serviceworkerregistration-inter
      <section class="algorithm" data-algorithm="navigator-service-worker-installing">
       <h4 class="heading settled" data-level="3.2.1" id="navigator-service-worker-installing"><span class="secno">3.2.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-installing" id="ref-for-dom-serviceworkerregistration-installing①">installing</a></code></span><a class="self-link" href="#navigator-service-worker-installing"></a></h4>
       <p><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-installing"><code>installing</code></dfn> attribute <em>must</em> return the value to which it was last set.</p>
-      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①②">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④③">service worker</a> are the same objects.</p>
+      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①②">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④②">service worker</a> are the same objects.</p>
      </section>
      <section class="algorithm" data-algorithm="navigator-service-worker-waiting">
       <h4 class="heading settled" data-level="3.2.2" id="navigator-service-worker-waiting"><span class="secno">3.2.2. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-waiting" id="ref-for-dom-serviceworkerregistration-waiting①">waiting</a></code></span><a class="self-link" href="#navigator-service-worker-waiting"></a></h4>
       <p><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-waiting"><code>waiting</code></dfn> attribute <em>must</em> return the value to which it was last set.</p>
-      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①③">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④④">service worker</a> are the same objects.</p>
+      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①③">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④③">service worker</a> are the same objects.</p>
      </section>
      <section class="algorithm" data-algorithm="navigator-service-worker-active">
       <h4 class="heading settled" data-level="3.2.3" id="navigator-service-worker-active"><span class="secno">3.2.3. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-active" id="ref-for-dom-serviceworkerregistration-active①">active</a></code></span><a class="self-link" href="#navigator-service-worker-active"></a></h4>
       <p><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-active"><code>active</code></dfn> attribute <em>must</em> return the value to which it was last set.</p>
-      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①④">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑤">service worker</a> are the same objects.</p>
+      <p class="note" role="note"><span>Note:</span> The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①④">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④④">service worker</a> are the same objects.</p>
      </section>
      <section class="algorithm" data-algorithm="service-worker-registration-navigationpreload">
       <h4 class="heading settled" data-level="3.2.4" id="service-worker-registration-navigationpreload"><span class="secno">3.2.4. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-navigationpreload" id="ref-for-dom-serviceworkerregistration-navigationpreload①">navigationPreload</a></code></span><a class="self-link" href="#service-worker-registration-navigationpreload"></a></h4>
@@ -2055,7 +2059,7 @@ <h4 class="heading settled" data-level="3.2.7" id="service-worker-registration-u
        <li data-md="">
         <p>If <var>newestWorker</var> is null, return <a data-link-type="dfn" href="https://www.w3.org/2001/tag/doc/promises-guide/#a-promise-rejected-with" id="ref-for-a-promise-rejected-with">a promise rejected with</a> an "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#invalidstateerror" id="ref-for-invalidstateerror①">InvalidStateError</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> and abort these steps.</p>
        <li data-md="">
-        <p>If 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#concept-settings-object-global" id="ref-for-concept-settings-object-global⑤">global object</a> <var>globalObject</var> is a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope④">ServiceWorkerGlobalScope</a></code> object, and <var>globalObject</var>’s associated <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker①">service worker</a>'s <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state④">state</a> is <em>installing</em>, return <a data-link-type="dfn" href="https://www.w3.org/2001/tag/doc/promises-guide/#a-promise-rejected-with" id="ref-for-a-promise-rejected-with①">a promise rejected with</a> an "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#invalidstateerror" id="ref-for-invalidstateerror②">InvalidStateError</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> and abort these steps.</p>
+        <p>If 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#concept-settings-object-global" id="ref-for-concept-settings-object-global⑤">global object</a> <var>globalObject</var> is a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope③">ServiceWorkerGlobalScope</a></code> object, and <var>globalObject</var>’s associated <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker①">service worker</a>'s <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state④">state</a> is <em>installing</em>, return <a data-link-type="dfn" href="https://www.w3.org/2001/tag/doc/promises-guide/#a-promise-rejected-with" id="ref-for-a-promise-rejected-with①">a promise rejected with</a> an "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#invalidstateerror" id="ref-for-invalidstateerror②">InvalidStateError</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> and abort these steps.</p>
        <li data-md="">
         <p>Let <var>promise</var> be a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects">promise</a>.</p>
        <li data-md="">
@@ -2138,7 +2142,7 @@ <h3 class="heading settled" data-level="3.4" id="serviceworkercontainer-interfac
 };
 </pre>
      <p>The user agent <em>must</em> create a <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer④">ServiceWorkerContainer</a></code> object when a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/system-state.html#navigator" id="ref-for-navigator①">Navigator</a></code> object or a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/workers.html#workernavigator" id="ref-for-workernavigator①">WorkerNavigator</a></code> object is created and associate it with that object.</p>
-     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer⑤">ServiceWorkerContainer</a></code> provides capabilities to register, unregister, and update the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③⑧">service worker registrations</a>, and provides access to the state of the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③⑨">service worker registrations</a> and their associated <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑥">service workers</a>.</p>
+     <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer⑤">ServiceWorkerContainer</a></code> provides capabilities to register, unregister, and update the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③⑧">service worker registrations</a>, and provides access to the state of the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration③⑨">service worker registrations</a> and their associated <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑤">service workers</a>.</p>
      <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer⑥">ServiceWorkerContainer</a></code> has an associated <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerContainer" data-dfn-type="dfn" data-noexport="" id="serviceworkercontainer-service-worker-client">service worker client</dfn>, which is a <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client②④">service worker client</a> whose <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> is associated with the <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/system-state.html#navigator" id="ref-for-navigator②">Navigator</a></code> object or the <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/workers.html#workernavigator" id="ref-for-workernavigator②">WorkerNavigator</a></code> object that the <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer⑦">ServiceWorkerContainer</a></code> is retrieved from.</p>
      <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer⑧">ServiceWorkerContainer</a></code> object has an associated <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerContainer" data-dfn-type="dfn" data-noexport="" id="serviceworkercontainer-ready-promise">ready promise</dfn> (a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects" id="ref-for-sec-promise-objects②">promise</a>). It is initially set to <a data-link-type="dfn" href="https://www.w3.org/2001/tag/doc/promises-guide/#a-new-promise" id="ref-for-a-new-promise">a new promise</a>.</p>
      <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer⑨">ServiceWorkerContainer</a></code> object has a <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source③">task source</a> called the <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerContainer" data-dfn-type="dfn" data-export="" id="dfn-client-message-queue">client message queue</dfn>, initially empty. A <a data-link-type="dfn" href="#dfn-client-message-queue" id="ref-for-dfn-client-message-queue">client message queue</a> can be enabled or disabled, and is initially disabled. When a <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer①⓪">ServiceWorkerContainer</a></code> object’s <a data-link-type="dfn" href="#dfn-client-message-queue" id="ref-for-dfn-client-message-queue①">client message queue</a> is enabled, the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop" id="ref-for-event-loop④">event loop</a> <em>must</em> use it as one of its <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="ref-for-task-source④">task sources</a>. When the <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer①①">ServiceWorkerContainer</a></code> object’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-relevant-global" id="ref-for-concept-relevant-global">relevant global object</a> is a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/window-object.html#window" id="ref-for-window②">Window</a></code> object, all <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-task" id="ref-for-concept-task②">tasks</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> on its <a data-link-type="dfn" href="#dfn-client-message-queue" id="ref-for-dfn-client-message-queue②">client message queue</a> <em>must</em> be associated with its <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#responsible-document" id="ref-for-responsible-document">responsible document</a>.</p>
@@ -2151,7 +2155,7 @@ <h4 class="heading settled" data-level="3.4.1" id="navigator-service-worker-cont
        <li data-md="">
         <p>Return the <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①⑥">ServiceWorker</a></code> object that represents <var>client</var>’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>.</p>
       </ol>
-      <p class="note" role="note"><span>Note:</span> <code class="idl"><a data-link-type="idl" href="#dom-serviceworkercontainer-controller" id="ref-for-dom-serviceworkercontainer-controller②">navigator.serviceWorker.controller</a></code> returns <code>null</code> if the request is a force refresh (shift+refresh). The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①⑦">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑦">service worker</a> are the same objects.</p>
+      <p class="note" role="note"><span>Note:</span> <code class="idl"><a data-link-type="idl" href="#dom-serviceworkercontainer-controller" id="ref-for-dom-serviceworkercontainer-controller②">navigator.serviceWorker.controller</a></code> returns <code>null</code> if the request is a force refresh (shift+refresh). The <code class="idl"><a data-link-type="idl" href="#serviceworker" id="ref-for-serviceworker①⑦">ServiceWorker</a></code> objects returned from this attribute getter that represent the same <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker④⑥">service worker</a> are the same objects.</p>
      </section>
      <section class="algorithm" data-algorithm="navigator-service-worker-ready">
       <h4 class="heading settled" data-level="3.4.2" id="navigator-service-worker-ready"><span class="secno">3.4.2. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkercontainer-ready" id="ref-for-dom-serviceworkercontainer-ready①">ready</a></code></span><a class="self-link" href="#navigator-service-worker-ready"></a></h4>
@@ -2330,7 +2334,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>
@@ -2447,7 +2451,7 @@ <h2 class="heading settled" data-level="4" id="execution-context"><span class="s
 </pre>
     </div>
     <section>
-     <h3 class="heading settled" data-level="4.1" id="serviceworkerglobalscope-interface"><span class="secno">4.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑤">ServiceWorkerGlobalScope</a></code></span><a class="self-link" href="#serviceworkerglobalscope-interface"></a></h3>
+     <h3 class="heading settled" data-level="4.1" id="serviceworkerglobalscope-interface"><span class="secno">4.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope④">ServiceWorkerGlobalScope</a></code></span><a class="self-link" href="#serviceworkerglobalscope-interface"></a></h3>
 <pre class="idl highlight def">[<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Global" id="ref-for-Global">Global</a>=(<a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#worker" id="ref-for-worker">Worker</a>,<a class="n" data-link-type="idl-name" href="#serviceworker" id="ref-for-serviceworker②⓪">ServiceWorker</a>), <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed" id="ref-for-Exposed④">Exposed</a>=<span class="n">ServiceWorker</span>]
 <span class="kt">interface</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="interface" data-export="" id="serviceworkerglobalscope"><code>ServiceWorkerGlobalScope</code></dfn> : <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workerglobalscope" id="ref-for-workerglobalscope">WorkerGlobalScope</a> {
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject" id="ref-for-SameObject③">SameObject</a>] <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#clients" id="ref-for-clients">Clients</a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="Clients" href="#dom-serviceworkerglobalscope-clients" id="ref-for-dom-serviceworkerglobalscope-clients">clients</a>;
@@ -2464,8 +2468,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>
@@ -2476,7 +2480,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="">
@@ -2497,7 +2501,7 @@ <h4 class="heading settled" data-level="4.1.3" id="service-worker-global-scope-s
      </section>
      <section>
       <h4 class="heading settled" data-level="4.1.4" id="service-worker-global-scope-event-handlers"><span class="secno">4.1.4. </span><span class="content">Event handlers</span><a class="self-link" href="#service-worker-global-scope-event-handlers"></a></h4>
-      <p>The following are the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑥">event handlers</a> (and their corresponding <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-event-type" id="ref-for-event-handler-event-type⑥">event handler event types</a>) that <em>must</em> be supported, as <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-idl-attributes" id="ref-for-event-handler-idl-attributes③">event handler IDL attributes</a>, by all objects implementing the <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⓪">ServiceWorkerGlobalScope</a></code> interface:</p>
+      <p>The following are the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers" id="ref-for-event-handlers⑥">event handlers</a> (and their corresponding <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-event-type" id="ref-for-event-handler-event-type⑥">event handler event types</a>) that <em>must</em> be supported, as <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-idl-attributes" id="ref-for-event-handler-idl-attributes③">event handler IDL attributes</a>, by all objects implementing the <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope⑨">ServiceWorkerGlobalScope</a></code> interface:</p>
       <table class="data">
        <thead>
         <tr>
@@ -2753,7 +2757,7 @@ <h3 class="heading settled" data-level="4.3" id="clients-interface"><span class=
   <dfn class="s dfn-paneled idl-code" data-dfn-for="ClientType" data-dfn-type="enum-value" data-export="" id="dom-clienttype-all"><code>"all"</code></dfn>
 };
 </pre>
-     <p>The user agent <em>must</em> create a <code class="idl"><a data-link-type="idl" href="#clients" id="ref-for-clients③">Clients</a></code> object when a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①①">ServiceWorkerGlobalScope</a></code> object is created and associate it with that object.</p>
+     <p>The user agent <em>must</em> create a <code class="idl"><a data-link-type="idl" href="#clients" id="ref-for-clients③">Clients</a></code> object when a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⓪">ServiceWorkerGlobalScope</a></code> object is created and associate it with that object.</p>
      <section class="algorithm" data-algorithm="clients-get">
       <h4 class="heading settled" data-level="4.3.1" id="clients-get"><span class="secno">4.3.1. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-clients-get" id="ref-for-dom-clients-get①">get(id)</a></code></span><a class="self-link" href="#clients-get"></a></h4>
       <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="Clients" data-dfn-type="method" data-export="" id="dom-clients-get"><code>get(<var>id</var>)</code></dfn> method <em>must</em> run these steps:</p>
@@ -3028,7 +3032,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>
@@ -3058,10 +3062,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>
@@ -3084,7 +3088,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="">
@@ -3104,15 +3108,15 @@ <h4 class="heading settled" data-level="4.5.2" id="fetch-event-preloadresponse">
      </section>
      <section>
       <h4 class="heading settled" data-level="4.5.3" id="fetch-event-clientid"><span class="secno">4.5.3. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-fetchevent-clientid" id="ref-for-dom-fetchevent-clientid①">event.clientId</a></code></span><a class="self-link" href="#fetch-event-clientid"></a></h4>
-      <p><dfn class="dfn-paneled idl-code" data-dfn-for="FetchEvent" data-dfn-type="attribute" data-export="" id="dom-fetchevent-clientid"><code>clientId</code></dfn> attribute <em>must</em> return the value it was initialized to. When an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event">event</a> is created the attribute <em>must</em> be initialized to the empty string.</p>
+      <p><dfn class="dfn-paneled idl-code" data-dfn-for="FetchEvent" data-dfn-type="attribute" data-export="" id="dom-fetchevent-clientid"><code>clientId</code></dfn> attribute <em>must</em> return the value it was initialized to. When an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event②">event</a> is created the attribute <em>must</em> be initialized to the empty string.</p>
      </section>
      <section>
       <h4 class="heading settled" data-level="4.5.4" id="fetch-event-resultingclientid"><span class="secno">4.5.4. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-fetchevent-resultingclientid" id="ref-for-dom-fetchevent-resultingclientid①">event.resultingClientId</a></code></span><a class="self-link" href="#fetch-event-resultingclientid"></a></h4>
-      <p><dfn class="dfn-paneled idl-code" data-dfn-for="FetchEvent" data-dfn-type="attribute" data-export="" id="dom-fetchevent-resultingclientid"><code>resultingClientId</code></dfn> attribute <em>must</em> return the value it was initialized to. When an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event①">event</a> is created the attribute <em>must</em> be initialized to the empty string.</p>
+      <p><dfn class="dfn-paneled idl-code" data-dfn-for="FetchEvent" data-dfn-type="attribute" data-export="" id="dom-fetchevent-resultingclientid"><code>resultingClientId</code></dfn> attribute <em>must</em> return the value it was initialized to. When an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event③">event</a> is created the attribute <em>must</em> be initialized to the empty string.</p>
      </section>
      <section>
       <h4 class="heading settled" data-level="4.5.5" id="fetch-event-targetclientid"><span class="secno">4.5.5. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-fetchevent-targetclientid" id="ref-for-dom-fetchevent-targetclientid①">event.targetClientId</a></code></span><a class="self-link" href="#fetch-event-targetclientid"></a></h4>
-      <p><dfn class="dfn-paneled idl-code" data-dfn-for="FetchEvent" data-dfn-type="attribute" data-export="" id="dom-fetchevent-targetclientid"><code>targetClientId</code></dfn> attribute <em>must</em> return the value it was initialized to. When an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event②">event</a> is created the attribute <em>must</em> be initialized to the empty string.</p>
+      <p><dfn class="dfn-paneled idl-code" data-dfn-for="FetchEvent" data-dfn-type="attribute" data-export="" id="dom-fetchevent-targetclientid"><code>targetClientId</code></dfn> attribute <em>must</em> return the value it was initialized to. When an <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event" id="ref-for-concept-event④">event</a> is created the attribute <em>must</em> be initialized to the empty string.</p>
      </section>
      <section class="algorithm" data-algorithm="fetch-event-respondwith">
       <h4 class="heading settled" data-level="4.5.6" id="fetch-event-respondwith"><span class="secno">4.5.6. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-fetchevent-respondwith" id="ref-for-dom-fetchevent-respondwith①">event.respondWith(r)</a></code></span><a class="self-link" href="#fetch-event-respondwith"></a></h4>
@@ -3267,7 +3271,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>
@@ -3291,33 +3295,69 @@ <h4 class="heading settled" data-level="4.6.5" id="extendablemessage-event-ports
     </section>
     <section>
      <h3 class="heading settled" data-level="4.7" id="execution-context-events"><span class="secno">4.7. </span><span class="content">Events</span><a class="self-link" href="#execution-context-events"></a></h3>
-     <p>The following events are dispatched on <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①②">ServiceWorkerGlobalScope</a></code> object:</p>
+     <p>The following events are dispatched on <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①①">ServiceWorkerGlobalScope</a></code> object:</p>
      <table class="data">
       <thead>
        <tr>
         <th>Event name
         <th>Interface
+        <th>Category
         <th>Dispatched when…
       <tbody>
        <tr>
         <td><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="event" data-export="" id="service-worker-global-scope-install-event"><code>install</code></dfn>
         <td><code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent①⓪">ExtendableEvent</a></code>
-        <td>[<a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events①">Lifecycle event</a>] The <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker①⑨">service worker</a>'s <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration⑨">containing service worker registration</a>’s <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker⑤">installing worker</a> changes. (See step 11.2 of the <a data-link-type="dfn" href="#install" id="ref-for-install①">Install</a> algorithm.)
+        <td><a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events②">Lifecycle</a>
+        <td>The <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker①⑨">service worker</a>'s <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration⑨">containing service worker registration</a>’s <a data-link-type="dfn" href="#dfn-installing-worker" id="ref-for-dfn-installing-worker⑤">installing worker</a> changes. (See step 11.2 of the <a data-link-type="dfn" href="#install" id="ref-for-install①">Install</a> algorithm.)
        <tr>
         <td><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="event" data-export="" id="service-worker-global-scope-activate-event"><code>activate</code></dfn>
         <td><code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent①①">ExtendableEvent</a></code>
-        <td>[<a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events②">Lifecycle event</a>] The <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker②⓪">service worker</a>'s <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration①⓪">containing service worker registration</a>’s <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①⑨">active worker</a> changes. (See step 12.2 of the <a data-link-type="dfn" href="#activate" id="ref-for-activate②">Activate</a> algorithm.)
+        <td><a data-link-type="dfn" href="#dfn-lifecycle-events" id="ref-for-dfn-lifecycle-events③">Lifecycle</a>
+        <td>The <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker②⓪">service worker</a>'s <a data-link-type="dfn" href="#dfn-containing-service-worker-registration" id="ref-for-dfn-containing-service-worker-registration①⓪">containing service worker registration</a>’s <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker①⑨">active worker</a> changes. (See step 12.2 of the <a data-link-type="dfn" href="#activate" id="ref-for-activate②">Activate</a> algorithm.)
        <tr>
         <td><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="event" data-export="" id="service-worker-global-scope-fetch-event"><code>fetch</code></dfn>
         <td><code class="idl"><a data-link-type="idl" href="#fetchevent" id="ref-for-fetchevent③">FetchEvent</a></code>
-        <td>[<a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events③">Functional event</a>] The <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-http-fetch" id="ref-for-concept-http-fetch">http fetch</a> invokes <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch③">Handle Fetch</a> with <var>request</var>. As a result of performing <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch④">Handle Fetch</a>, the <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker②①">service worker</a> returns a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response②">response</a> to the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-http-fetch" id="ref-for-concept-http-fetch①">http fetch</a>. The <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response③">response</a>, represented by a <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response④">Response</a></code> object, can be retrieved from a <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache">Cache</a></code> object or directly from network using <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#dom-global-fetch" id="ref-for-dom-global-fetch">self.fetch(input, init)</a></code> method. (A custom <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response⑤">Response</a></code> object can be another option.)
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events④">Functional</a>
+        <td>The <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-http-fetch" id="ref-for-concept-http-fetch">http fetch</a> invokes <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch③">Handle Fetch</a> with <var>request</var>. As a result of performing <a data-link-type="dfn" href="#handle-fetch" id="ref-for-handle-fetch④">Handle Fetch</a>, the <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker②①">service worker</a> returns a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response②">response</a> to the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-http-fetch" id="ref-for-concept-http-fetch①">http fetch</a>. The <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response" id="ref-for-concept-response③">response</a>, represented by a <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response④">Response</a></code> object, can be retrieved from a <code class="idl"><a data-link-type="idl" href="#cache" id="ref-for-cache">Cache</a></code> object or directly from network using <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#dom-global-fetch" id="ref-for-dom-global-fetch">self.fetch(input, init)</a></code> method. (A custom <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#response" id="ref-for-response⑤">Response</a></code> object can be another option.)
+       <tr>
+        <td><a href="https://w3c.github.io/push-api/#dfn-push">push</a>
+        <td><a href="https://w3c.github.io/push-api/#dom-pushevent"><code>PushEvent</code></a>
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑤">Functional</a>
+        <td>(See <a href="https://w3c.github.io/push-api/#dfn-fire-the-push-event">Firing a push event</a>.)
+       <tr>
+        <td><a href="https://notifications.spec.whatwg.org/#dom-serviceworkerglobalscope-onnotificationclick">notificationclick</a>
+        <td><a href="https://notifications.spec.whatwg.org/#notificationevent"><code>NotificationEvent</code></a>
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑥">Functional</a>
+        <td>(See <a href="https://notifications.spec.whatwg.org/#activating-a-notification">Activating a notification.</a>)
+       <tr>
+        <td><a href="https://notifications.spec.whatwg.org/#dom-serviceworkerglobalscope-onnotificationclose">notificationclose</a>
+        <td><a href="https://notifications.spec.whatwg.org/#notificationevent"><code>NotificationEvent</code></a>
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑦">Functional</a>
+        <td>(See <a href="https://notifications.spec.whatwg.org/#closing-a-notification">Closing a notification.</a>)
+       <tr>
+        <td><a href="https://wicg.github.io/BackgroundSync/spec/#sync">sync</a>
+        <td><a href="https://wicg.github.io/BackgroundSync/spec/#syncevent"><code>SyncEvent</code></a>
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑧">Functional</a>
+        <td>(See <a href="https://wicg.github.io/BackgroundSync/spec/#fire-a-sync-event">Firing a sync event</a>.)
+       <tr>
+        <td><a href="https://w3c.github.io/payment-handler/#the-canmakepaymentevent">canmakepayment</a>
+        <td><a href="https://w3c.github.io/payment-handler/#dom-canmakepaymentevent">CanMakePaymentEvent</a>
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑨">Functional</a>
+        <td>(See <a href="https://w3c.github.io/payment-handler/#dfn-handling-a-canmakepaymentevent">Handling a CanMakePaymentEvent</a>.)
+       <tr>
+        <td><a href="https://w3c.github.io/payment-handler/#the-paymentrequestevent">paymentrequest</a>
+        <td><a href="https://w3c.github.io/payment-handler/#dom-paymentrequestevent">PaymentRequestEvent</a>
+        <td><a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①⓪">Functional</a>
+        <td>(See <a href="https://w3c.github.io/payment-handler/#dfn-handling-a-paymentrequestevent">Handling a PaymentRequestEvent</a>.)
        <tr>
         <td><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="event" data-export="" id="eventdef-serviceworkerglobalscope-message"><code>message</code></dfn>
         <td><code class="idl"><a data-link-type="idl" href="#extendablemessageevent" id="ref-for-extendablemessageevent③">ExtendableMessageEvent</a></code>
+        <td>Legacy
         <td>When it receives a message.
        <tr>
         <td><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="event" data-export="" id="eventdef-serviceworkerglobalscope-messageerror"><code>messageerror</code></dfn>
         <td><code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/comms.html#messageevent" id="ref-for-messageevent③">MessageEvent</a></code>
+        <td>Legacy
         <td>When it was sent a message that cannot be deserialized.
      </table>
     </section>
@@ -3335,7 +3375,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>
@@ -3536,7 +3576,7 @@ <h4 class="heading settled" data-level="5.4.4" id="cache-addAll"><span class="se
             <p>Return <a data-link-type="dfn" href="https://www.w3.org/2001/tag/doc/promises-guide/#a-promise-rejected-with" id="ref-for-a-promise-rejected-with⑤">a promise rejected with</a> a <code>TypeError</code>.</p>
           </ol>
          <li data-md="">
-          <p>If <var>r</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client" id="ref-for-concept-request-client">client</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> is a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①③">ServiceWorkerGlobalScope</a></code> object, set <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#request-service-workers-mode" id="ref-for-request-service-workers-mode">service-workers mode</a> to "<code>none</code>".</p>
+          <p>If <var>r</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client" id="ref-for-concept-request-client">client</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> is a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①②">ServiceWorkerGlobalScope</a></code> object, set <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#request-service-workers-mode" id="ref-for-request-service-workers-mode">service-workers mode</a> to "<code>none</code>".</p>
          <li data-md="">
           <p>Set <var>r</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator" id="ref-for-concept-request-initiator">initiator</a> to "<code>fetch</code>" and <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination" id="ref-for-concept-request-destination">destination</a> to "<code>subresource</code>".</p>
          <li data-md="">
@@ -4034,12 +4074,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>
@@ -4053,11 +4093,11 @@ <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>
-      <p>When the <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="method" data-export="" id="importscripts-method"><code>importScripts(<var>urls</var>)</code></dfn> method is called on a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①④">ServiceWorkerGlobalScope</a></code> object, the user agent <em>must</em> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/workers.html#import-scripts-into-worker-global-scope" id="ref-for-import-scripts-into-worker-global-scope">import scripts into worker global scope</a>, given this <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⑤">ServiceWorkerGlobalScope</a></code> object and <var>urls</var>, and with the following steps to <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#fetching-scripts-perform-fetch" id="ref-for-fetching-scripts-perform-fetch">perform the fetch</a> given the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request" id="ref-for-concept-request②">request</a> <var>request</var>:</p>
+      <p>When the <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerGlobalScope" data-dfn-type="method" data-export="" id="importscripts-method"><code>importScripts(<var>urls</var>)</code></dfn> method is called on a <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①③">ServiceWorkerGlobalScope</a></code> object, the user agent <em>must</em> <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/workers.html#import-scripts-into-worker-global-scope" id="ref-for-import-scripts-into-worker-global-scope">import scripts into worker global scope</a>, given this <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①④">ServiceWorkerGlobalScope</a></code> object and <var>urls</var>, and with the following steps to <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#fetching-scripts-perform-fetch" id="ref-for-fetching-scripts-perform-fetch">perform the fetch</a> given the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request" id="ref-for-concept-request②">request</a> <var>request</var>:</p>
       <ol>
        <li data-md="">
         <p>Let <var>serviceWorker</var> be <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client" id="ref-for-concept-request-client①">client</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>'s <a data-link-type="dfn" href="#serviceworkerglobalscope-service-worker" id="ref-for-serviceworkerglobalscope-service-worker②②">service worker</a>.</p>
@@ -4103,7 +4143,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>
@@ -4111,19 +4151,19 @@ <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>Service Workers specification is 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>
@@ -4137,7 +4177,7 @@ <h3 class="heading settled" data-level="7.1" id="extension-to-service-worker-reg
     </section>
     <section>
      <h3 class="heading settled" data-level="7.2" id="extension-to-extendable-event"><span class="secno">7.2. </span><span class="content">Define Functional Event</span><a class="self-link" href="#extension-to-extendable-event"></a></h3>
-     <p>Specifications <em>may</em> define a <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events④">functional event</a> by extending <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent①②">ExtendableEvent</a></code> interface:</p>
+     <p>Specifications <em>may</em> define a <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①①">functional event</a> by extending <code class="idl"><a data-link-type="idl" href="#extendableevent" id="ref-for-extendableevent①②">ExtendableEvent</a></code> interface:</p>
 <pre class="example idl highlight def" data-no-idl="" id="example-85e5c3c4"><a class="self-link" href="#example-85e5c3c4"></a>// e.g. define FunctionalEvent interface
 <span class="kt">interface</span> <span class="nv">FunctionalEvent</span> : <span class="n">ExtendableEvent</span> {
   // add a functional event’s own attributes and methods
@@ -4146,7 +4186,7 @@ <h3 class="heading settled" data-level="7.2" id="extension-to-extendable-event">
     </section>
     <section>
      <h3 class="heading settled" data-level="7.3" id="extension-to-service-worker-global-scope"><span class="secno">7.3. </span><span class="content">Define Event Handler</span><a class="self-link" href="#extension-to-service-worker-global-scope"></a></h3>
-     <p>Specifications <em>may</em> define an event handler attribute for the corresponding <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events⑤">functional event</a> 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="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⑥">ServiceWorkerGlobalScope</a></code> interface:</p>
+     <p>Specifications <em>may</em> define an event handler attribute for the corresponding <a data-link-type="dfn" href="#dfn-functional-events" id="ref-for-dfn-functional-events①②">functional event</a> 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="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⑤">ServiceWorkerGlobalScope</a></code> interface:</p>
 <pre class="example idl highlight def" data-no-idl="" id="example-80342678"><a class="self-link" href="#example-80342678"></a><span class="kt">partial</span> <span class="kt">interface</span> <span class="nv">ServiceWorkerGlobalScope</span> {
   <span class="kt">attribute</span> <span class="n">EventHandler</span> <span class="nv">onfunctionalevent</span>;
 };
@@ -4154,8 +4194,8 @@ <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>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>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>
    </section>
@@ -4406,7 +4446,7 @@ <h3 class="heading settled" id="start-register-algorithm"><span class="content">
        <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>
+       <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="">
@@ -4686,7 +4726,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content"><dfn cla
          <p>Invoke <a data-link-type="dfn" href="#finish-job" id="ref-for-finish-job⑦">Finish Job</a> with <var>job</var> and abort these steps.</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="">
@@ -4751,7 +4791,7 @@ <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>
       <dt data-md="">Output
@@ -4772,7 +4812,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="">
@@ -4945,7 +4985,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
@@ -4965,7 +5005,7 @@ <h3 class="heading settled" id="run-service-worker-algorithm"><span class="conte
        <p>Call the JavaScript <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-initializehostdefinedrealm" id="ref-for-sec-initializehostdefinedrealm">InitializeHostDefinedRealm()</a> abstract operation with the following customizations:</p>
        <ul>
         <li data-md="">
-         <p>For the global object, create a new <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⑧">ServiceWorkerGlobalScope</a></code> object. Let <var>workerGlobalScope</var> be the created object.</p>
+         <p>For the global object, create a new <code class="idl"><a data-link-type="idl" href="#serviceworkerglobalscope" id="ref-for-serviceworkerglobalscope①⑦">ServiceWorkerGlobalScope</a></code> object. Let <var>workerGlobalScope</var> be the created object.</p>
         <li data-md="">
          <p>Let <var>realmExecutionContext</var> be the created <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-execution-contexts" id="ref-for-sec-execution-contexts">JavaScript execution context</a>.</p>
        </ul>
@@ -5047,7 +5087,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>
@@ -5070,7 +5110,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="">
@@ -5380,9 +5420,9 @@ <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>
+       <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
       <dd data-md="">
        <p>None</p>
@@ -5546,7 +5586,7 @@ <h3 class="heading settled" id="update-registration-state-algorithm"><span class
       <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>
@@ -5598,9 +5638,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>
@@ -5622,23 +5662,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>
@@ -5742,7 +5782,7 @@ <h3 class="heading settled" id="get-newest-worker-algorithm"><span class="conten
        <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="">
@@ -5764,7 +5804,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>
@@ -6099,17 +6139,17 @@ <h3 class="heading settled" id="resolve-get-client-promise-algorithm"><span clas
     <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="">
@@ -6155,7 +6195,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>
@@ -6292,7 +6332,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
    <li><a href="#dfn-service-worker-client-focusstate">focus state</a><span>, in §4.2</span>
    <li><a href="#dfn-job-force-bypass-cache-flag">force bypass cache flag</a><span>, in §Unnumbered section</span>
    <li><a href="#serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag">force bypass cache for importscripts flag</a><span>, in §4.1</span>
-   <li><a href="#dfn-functional-events">functional events</a><span>, in §2.1</span>
+   <li><a href="#dfn-functional-events">functional events</a><span>, in §2.1.2</span>
    <li><a href="#dom-clients-get">get(id)</a><span>, in §4.3.1</span>
    <li><a href="#get-newest-worker">Get Newest Worker</a><span>, in §Unnumbered section</span>
    <li><a href="#get-registration">Get Registration</a><span>, in §Unnumbered section</span>
@@ -6348,7 +6388,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
      <li><a href="#dom-extendablemessageeventinit-lasteventid">dict-member for ExtendableMessageEventInit</a><span>, in §4.6</span>
     </ul>
    <li><a href="#dfn-last-update-check-time">last update check time</a><span>, in §2.2</span>
-   <li><a href="#dfn-lifecycle-events">lifecycle events</a><span>, in §2.1</span>
+   <li><a href="#dfn-lifecycle-events">lifecycle events</a><span>, in §2.1.2</span>
    <li><a href="#dfn-job-list-of-equivalent-jobs">list of equivalent jobs</a><span>, in §Unnumbered section</span>
    <li>
     matchAll()
@@ -6737,10 +6777,11 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
   <aside class="dfn-panel" data-for="term-for-concept-event">
    <a href="https://dom.spec.whatwg.org/#concept-event">https://dom.spec.whatwg.org/#concept-event</a><b>Referenced in:</b>
    <ul>
-    <li><a href="#ref-for-concept-event">4.5.3. event.clientId</a>
-    <li><a href="#ref-for-concept-event①">4.5.4. event.resultingClientId</a>
-    <li><a href="#ref-for-concept-event②">4.5.5. event.targetClientId</a>
-    <li><a href="#ref-for-concept-event③">Update Service Worker Extended Events Set</a>
+    <li><a href="#ref-for-concept-event">2.1.2. Events</a> <a href="#ref-for-concept-event①">(2)</a>
+    <li><a href="#ref-for-concept-event②">4.5.3. event.clientId</a>
+    <li><a href="#ref-for-concept-event③">4.5.4. event.resultingClientId</a>
+    <li><a href="#ref-for-concept-event④">4.5.5. event.targetClientId</a>
+    <li><a href="#ref-for-concept-event⑤">Update Service Worker Extended Events Set</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="term-for-concept-event-listener">
@@ -9277,7 +9318,7 @@ <h3 class="no-num no-ref heading settled" id="informative"><span class="content"
    <dd><a href="https://www.w3.org/2001/tag/doc/unsanctioned-tracking/">Unsanctioned Web Tracking</a>. 17 July 2015. Finding of the W3C TAG. URL: <a href="https://www.w3.org/2001/tag/doc/unsanctioned-tracking/">https://www.w3.org/2001/tag/doc/unsanctioned-tracking/</a>
   </dl>
   <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">IDL Index</span><a class="self-link" href="#idl-index"></a></h2>
-<pre class="idl highlight def">[<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext" id="ref-for-SecureContext⑨">SecureContext</a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed" id="ref-for-Exposed①③">Exposed</a>=(<span class="n">Window</span>,<span class="n">Worker</span>)]
+<pre class="idl highlight def">[<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext" id="ref-for-SecureContext⑨">SecureContext</a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed" id="ref-for-Exposed①④">Exposed</a>=(<span class="n">Window</span>,<span class="n">Worker</span>)]
 <span class="kt">interface</span> <a class="nv" href="#serviceworker"><code>ServiceWorker</code></a> : <a class="n" data-link-type="idl-name" href="https://dom.spec.whatwg.org/#eventtarget" id="ref-for-eventtarget③">EventTarget</a> {
   <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString" id="ref-for-idl-USVString①①"><span class="kt">USVString</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="USVString" href="#dom-serviceworker-scripturl" id="ref-for-dom-serviceworker-scripturl②">scriptURL</a>;
   <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerstate" id="ref-for-enumdef-serviceworkerstate④">ServiceWorkerState</a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerState" href="#dom-serviceworker-state" id="ref-for-dom-serviceworker-state⑤">state</a>;
@@ -9296,7 +9337,7 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <a class="s" href="#dom-serviceworkerstate-redundant"><code>"redundant"</code></a>
 };
 
-[<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext" id="ref-for-SecureContext①①">SecureContext</a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed" id="ref-for-Exposed①④">Exposed</a>=(<span class="n">Window</span>,<span class="n">Worker</span>)]
+[<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext" id="ref-for-SecureContext①①">SecureContext</a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed" id="ref-for-Exposed①③">Exposed</a>=(<span class="n">Window</span>,<span class="n">Worker</span>)]
 <span class="kt">interface</span> <a class="nv" href="#serviceworkerregistration"><code>ServiceWorkerRegistration</code></a> : <a class="n" data-link-type="idl-name" href="https://dom.spec.whatwg.org/#eventtarget" id="ref-for-eventtarget①①">EventTarget</a> {
   <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#serviceworker" id="ref-for-serviceworker⑨①">ServiceWorker</a>? <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorker?" href="#dom-serviceworkerregistration-installing" id="ref-for-dom-serviceworkerregistration-installing③">installing</a>;
   <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#serviceworker" id="ref-for-serviceworker①⓪①">ServiceWorker</a>? <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorker?" href="#dom-serviceworkerregistration-waiting" id="ref-for-dom-serviceworkerregistration-waiting③">waiting</a>;
@@ -9500,49 +9541,48 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
    <b><a href="#dfn-service-worker">#dfn-service-worker</a></b><b>Referenced in:</b>
    <ul>
     <li><a href="#ref-for-dfn-service-worker">1. Motivations</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> <a href="#ref-for-dfn-service-worker①⓪">(11)</a> <a href="#ref-for-dfn-service-worker①①">(12)</a> <a href="#ref-for-dfn-service-worker①②">(13)</a> <a href="#ref-for-dfn-service-worker①③">(14)</a>
-    <li><a href="#ref-for-dfn-service-worker①④">2.1. Service Worker</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> <a href="#ref-for-dfn-service-worker②④">(11)</a> <a href="#ref-for-dfn-service-worker②⑤">(12)</a> <a href="#ref-for-dfn-service-worker②⑥">(13)</a>
-    <li><a href="#ref-for-dfn-service-worker②⑦">2.1.1. Lifetime</a> <a href="#ref-for-dfn-service-worker②⑧">(2)</a>
-    <li><a href="#ref-for-dfn-service-worker②⑨">2.2. Service Worker Registration</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③③">2.5. Task Sources</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③⑥">2.6. User Agent Shutdown</a>
-    <li><a href="#ref-for-dfn-service-worker③⑦">3.1. ServiceWorker</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④①">3.1.1. scriptURL</a>
-    <li><a href="#ref-for-dfn-service-worker④②">3.1.3. postMessage(message, transfer)</a>
-    <li><a href="#ref-for-dfn-service-worker④③">3.2.1. installing</a>
-    <li><a href="#ref-for-dfn-service-worker④④">3.2.2. waiting</a>
-    <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⑧⑥">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>
+    <li><a href="#ref-for-dfn-service-worker①④">2.1. Service Worker</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> <a href="#ref-for-dfn-service-worker②④">(11)</a> <a href="#ref-for-dfn-service-worker②⑤">(12)</a>
+    <li><a href="#ref-for-dfn-service-worker②⑥">2.1.1. Lifetime</a> <a href="#ref-for-dfn-service-worker②⑦">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker②⑧">2.2. Service Worker Registration</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③②">2.5. Task Sources</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③⑤">2.6. User Agent Shutdown</a>
+    <li><a href="#ref-for-dfn-service-worker③⑥">3.1. ServiceWorker</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④⓪">3.1.1. scriptURL</a>
+    <li><a href="#ref-for-dfn-service-worker④①">3.1.3. postMessage(message, transfer)</a>
+    <li><a href="#ref-for-dfn-service-worker④②">3.2.1. installing</a>
+    <li><a href="#ref-for-dfn-service-worker④③">3.2.2. waiting</a>
+    <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.4. Request Functional Event Dispatch</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">
@@ -9607,26 +9647,6 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
     <li><a href="#ref-for-dfn-service-worker-global-object⑤">Handle Functional Event</a>
    </ul>
   </aside>
-  <aside class="dfn-panel" data-for="dfn-lifecycle-events">
-   <b><a href="#dfn-lifecycle-events">#dfn-lifecycle-events</a></b><b>Referenced in:</b>
-   <ul>
-    <li><a href="#ref-for-dfn-lifecycle-events">4.4. ExtendableEvent</a>
-    <li><a href="#ref-for-dfn-lifecycle-events①">4.7. Events</a> <a href="#ref-for-dfn-lifecycle-events②">(2)</a>
-   </ul>
-  </aside>
-  <aside class="dfn-panel" data-for="dfn-functional-events">
-   <b><a href="#dfn-functional-events">#dfn-functional-events</a></b><b>Referenced in:</b>
-   <ul>
-    <li><a href="#ref-for-dfn-functional-events">2.5. Task Sources</a>
-    <li><a href="#ref-for-dfn-functional-events①">4.4. ExtendableEvent</a>
-    <li><a href="#ref-for-dfn-functional-events②">4.5. FetchEvent</a>
-    <li><a href="#ref-for-dfn-functional-events③">4.7. Events</a>
-    <li><a href="#ref-for-dfn-functional-events④">7.2. Define Functional Event</a>
-    <li><a href="#ref-for-dfn-functional-events⑤">7.3. Define Event Handler</a>
-    <li><a href="#ref-for-dfn-functional-events⑥">7.4. Request Functional Event Dispatch</a> <a href="#ref-for-dfn-functional-events⑦">(2)</a> <a href="#ref-for-dfn-functional-events⑧">(3)</a>
-    <li><a href="#ref-for-dfn-functional-events⑨">Update Worker State</a> <a href="#ref-for-dfn-functional-events①⓪">(2)</a>
-   </ul>
-  </aside>
   <aside class="dfn-panel" data-for="dfn-script-resource">
    <b><a href="#dfn-script-resource">#dfn-script-resource</a></b><b>Referenced in:</b>
    <ul>
@@ -9698,6 +9718,28 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
     <li><a href="#ref-for-dfn-set-of-extended-events④">Service Worker Has No Pending Events</a>
    </ul>
   </aside>
+  <aside class="dfn-panel" data-for="dfn-lifecycle-events">
+   <b><a href="#dfn-lifecycle-events">#dfn-lifecycle-events</a></b><b>Referenced in:</b>
+   <ul>
+    <li><a href="#ref-for-dfn-lifecycle-events">2.1.2. Events</a>
+    <li><a href="#ref-for-dfn-lifecycle-events①">4.4. ExtendableEvent</a>
+    <li><a href="#ref-for-dfn-lifecycle-events②">4.7. Events</a> <a href="#ref-for-dfn-lifecycle-events③">(2)</a>
+   </ul>
+  </aside>
+  <aside class="dfn-panel" data-for="dfn-functional-events">
+   <b><a href="#dfn-functional-events">#dfn-functional-events</a></b><b>Referenced in:</b>
+   <ul>
+    <li><a href="#ref-for-dfn-functional-events">2.1.2. Events</a>
+    <li><a href="#ref-for-dfn-functional-events①">2.5. Task Sources</a>
+    <li><a href="#ref-for-dfn-functional-events②">4.4. ExtendableEvent</a>
+    <li><a href="#ref-for-dfn-functional-events③">4.5. FetchEvent</a>
+    <li><a href="#ref-for-dfn-functional-events④">4.7. Events</a> <a href="#ref-for-dfn-functional-events⑤">(2)</a> <a href="#ref-for-dfn-functional-events⑥">(3)</a> <a href="#ref-for-dfn-functional-events⑦">(4)</a> <a href="#ref-for-dfn-functional-events⑧">(5)</a> <a href="#ref-for-dfn-functional-events⑨">(6)</a> <a href="#ref-for-dfn-functional-events①⓪">(7)</a>
+    <li><a href="#ref-for-dfn-functional-events①①">7.2. Define Functional Event</a>
+    <li><a href="#ref-for-dfn-functional-events①②">7.3. Define Event Handler</a>
+    <li><a href="#ref-for-dfn-functional-events①③">7.4. Request Functional Event Dispatch</a> <a href="#ref-for-dfn-functional-events①④">(2)</a> <a href="#ref-for-dfn-functional-events①⑤">(3)</a>
+    <li><a href="#ref-for-dfn-functional-events①⑥">Update Worker State</a> <a href="#ref-for-dfn-functional-events①⑦">(2)</a>
+   </ul>
+  </aside>
   <aside class="dfn-panel" data-for="dfn-service-worker-registration">
    <b><a href="#dfn-service-worker-registration">#dfn-service-worker-registration</a></b><b>Referenced in:</b>
    <ul>
@@ -10411,18 +10453,18 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <aside class="dfn-panel" data-for="serviceworkerglobalscope">
    <b><a href="#serviceworkerglobalscope">#serviceworkerglobalscope</a></b><b>Referenced in:</b>
    <ul>
-    <li><a href="#ref-for-serviceworkerglobalscope">2.1. Service Worker</a> <a href="#ref-for-serviceworkerglobalscope①">(2)</a>
-    <li><a href="#ref-for-serviceworkerglobalscope②">3.1.3. postMessage(message, transfer)</a> <a href="#ref-for-serviceworkerglobalscope③">(2)</a>
-    <li><a href="#ref-for-serviceworkerglobalscope④">3.2.7. update()</a>
-    <li><a href="#ref-for-serviceworkerglobalscope⑤">4.1. ServiceWorkerGlobalScope</a> <a href="#ref-for-serviceworkerglobalscope⑥">(2)</a> <a href="#ref-for-serviceworkerglobalscope⑦">(3)</a> <a href="#ref-for-serviceworkerglobalscope⑧">(4)</a> <a href="#ref-for-serviceworkerglobalscope⑨">(5)</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①⓪">4.1.4. Event handlers</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①①">4.3. Clients</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①②">4.7. Events</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①③">5.4.4. addAll(requests)</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①④">6.3.2. importScripts(urls)</a> <a href="#ref-for-serviceworkerglobalscope①⑤">(2)</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①⑥">7.3. Define Event Handler</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①⑦">7.4. Request Functional Event Dispatch</a>
-    <li><a href="#ref-for-serviceworkerglobalscope①⑧">Run Service Worker</a>
+    <li><a href="#ref-for-serviceworkerglobalscope">2.1. Service Worker</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①">3.1.3. postMessage(message, transfer)</a> <a href="#ref-for-serviceworkerglobalscope②">(2)</a>
+    <li><a href="#ref-for-serviceworkerglobalscope③">3.2.7. update()</a>
+    <li><a href="#ref-for-serviceworkerglobalscope④">4.1. ServiceWorkerGlobalScope</a> <a href="#ref-for-serviceworkerglobalscope⑤">(2)</a> <a href="#ref-for-serviceworkerglobalscope⑥">(3)</a> <a href="#ref-for-serviceworkerglobalscope⑦">(4)</a> <a href="#ref-for-serviceworkerglobalscope⑧">(5)</a>
+    <li><a href="#ref-for-serviceworkerglobalscope⑨">4.1.4. Event handlers</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①⓪">4.3. Clients</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①①">4.7. Events</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①②">5.4.4. addAll(requests)</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①③">6.3.2. importScripts(urls)</a> <a href="#ref-for-serviceworkerglobalscope①④">(2)</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①⑤">7.3. Define Event Handler</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①⑥">7.4. Request Functional Event Dispatch</a>
+    <li><a href="#ref-for-serviceworkerglobalscope①⑦">Run Service Worker</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="serviceworkerglobalscope-service-worker">
@@ -10920,7 +10962,7 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <aside class="dfn-panel" data-for="service-worker-global-scope-install-event">
    <b><a href="#service-worker-global-scope-install-event">#service-worker-global-scope-install-event</a></b><b>Referenced in:</b>
    <ul>
-    <li><a href="#ref-for-service-worker-global-scope-install-event">2.1. Service Worker</a>
+    <li><a href="#ref-for-service-worker-global-scope-install-event">2.1.2. Events</a>
     <li><a href="#ref-for-service-worker-global-scope-install-event①">4.1.4. Event handlers</a>
     <li><a href="#ref-for-service-worker-global-scope-install-event②">4.4. ExtendableEvent</a> <a href="#ref-for-service-worker-global-scope-install-event③">(2)</a> <a href="#ref-for-service-worker-global-scope-install-event④">(3)</a>
     <li><a href="#ref-for-service-worker-global-scope-install-event⑤">Install</a>
@@ -10929,7 +10971,7 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <aside class="dfn-panel" data-for="service-worker-global-scope-activate-event">
    <b><a href="#service-worker-global-scope-activate-event">#service-worker-global-scope-activate-event</a></b><b>Referenced in:</b>
    <ul>
-    <li><a href="#ref-for-service-worker-global-scope-activate-event">2.1. Service Worker</a>
+    <li><a href="#ref-for-service-worker-global-scope-activate-event">2.1.2. Events</a>
     <li><a href="#ref-for-service-worker-global-scope-activate-event①">4.1.4. Event handlers</a>
     <li><a href="#ref-for-service-worker-global-scope-activate-event②">4.4. ExtendableEvent</a> <a href="#ref-for-service-worker-global-scope-activate-event③">(2)</a> <a href="#ref-for-service-worker-global-scope-activate-event④">(3)</a>
     <li><a href="#ref-for-service-worker-global-scope-activate-event⑤">Activate</a>
@@ -10938,7 +10980,7 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <aside class="dfn-panel" data-for="service-worker-global-scope-fetch-event">
    <b><a href="#service-worker-global-scope-fetch-event">#service-worker-global-scope-fetch-event</a></b><b>Referenced in:</b>
    <ul>
-    <li><a href="#ref-for-service-worker-global-scope-fetch-event">2.1. Service Worker</a>
+    <li><a href="#ref-for-service-worker-global-scope-fetch-event">2.1.2. Events</a>
     <li><a href="#ref-for-service-worker-global-scope-fetch-event①">2.5. Task Sources</a>
     <li><a href="#ref-for-service-worker-global-scope-fetch-event②">4.1.4. Event handlers</a>
     <li><a href="#ref-for-service-worker-global-scope-fetch-event③">4.5. FetchEvent</a> <a href="#ref-for-service-worker-global-scope-fetch-event④">(2)</a>