From a369bc9e39dce568d9cb6bd286a7ae30356673c7 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Thu, 31 Aug 2017 11:40:55 +0300
Subject: [PATCH 1/9] Stop using incumbent settings object

This change is editorial.

Tracking bug: whatwg/html#1430
---
 index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 865e034..d8ca69d 100644
--- a/index.html
+++ b/index.html
@@ -136,7 +136,7 @@ <h2>
       </h2>
       <p>
         The following concepts, terms, and interfaces are defined in
-        [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], and [[!SECURE-CONTEXTS]]:
+        [[!HTML]], [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], and [[!SECURE-CONTEXTS]]:
       </p>
       <ul>
         <li>
@@ -180,8 +180,8 @@ <h2>
         </li>
         <li>
           <dfn><a href=
-          "https://www.w3.org/TR/html5/webappapis.html#incumbent-settings-object">
-          incumbent settings object</a></dfn>
+          "https://html.spec.whatwg.org/multipage/webappapis.html#current-settings-object">
+          current settings object</a></dfn>
         </li>
         <li>
           <a href=
@@ -255,7 +255,7 @@ <h2>
         the following steps:
       </p>
       <ol>
-        <li>If the <a>incumbent settings object</a> is not a <a>secure
+        <li>If the <a>current settings object</a> is not a <a>secure
         context</a>, then reject this <a>Navigator</a> object's <a>battery
         promise</a> with a "<a>SecurityError</a>" <a>DOMException</a>, return
         this <a>Navigator</a> object's <a>battery promise</a> and abort these

From 041b05988d3b3ceb42c92041649480f53227d487 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Thu, 31 Aug 2017 12:05:47 +0300
Subject: [PATCH 2/9] Allow use in same-origin children

---
 index.html | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index d8ca69d..07d4086 100644
--- a/index.html
+++ b/index.html
@@ -135,8 +135,8 @@ <h2>
         Terminology
       </h2>
       <p>
-        The following concepts, terms, and interfaces are defined in
-        [[!HTML]], [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], and [[!SECURE-CONTEXTS]]:
+        The following concepts, terms, and interfaces are defined in [[!HTML]],
+        [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], and [[!SECURE-CONTEXTS]]:
       </p>
       <ul>
         <li>
@@ -204,6 +204,21 @@ <h2>
           "https://www.w3.org/TR/secure-contexts/#secure-context"><dfn>secure
           context</dfn></a>
         </li>
+        <li>
+          <a href=
+          "https://html.spec.whatwg.org/multipage/browsers.html#active-document">
+          <dfn>active document</dfn></a>
+        </li>
+        <li>
+          <a href=
+          "https://html.spec.whatwg.org/multipage/origin.html#concept-origin"><dfn>
+          origin</dfn></a>
+        </li>
+        <li>
+          <a href=
+          "https://html.spec.whatwg.org/multipage/origin.html#same-origin-domain">
+          <dfn>same-origin domain</dfn></a>
+        </li>
       </ul>
     </section>
     <section class="informative">
@@ -261,11 +276,12 @@ <h2>
         this <a>Navigator</a> object's <a>battery promise</a> and abort these
         steps.
         </li>
-        <li>If the <a>browsing context</a> is not a <a>top-level browsing
-        context</a>, then reject this <a>Navigator</a> object's <a>battery
-        promise</a> with a "<a>SecurityError</a>" <a>DOMException</a>, return
-        this <a>Navigator</a> object's <a>battery promise</a> and abort these
-        steps.
+        <li>If the <a>top-level browsing context</a>'s <a>active document</a>'s
+        <a>origin</a> and the <a>origin</a> specified by the <a>current
+        settings object</a> is not <a>same-origin domain</a>, then reject this
+        <a>Navigator</a> object's <a>battery promise</a> with a
+        "<a>SecurityError</a>" <a>DOMException</a>, return this <a>Navigator</a>
+        object's <a>battery promise</a> and abort these steps.
         </li>
         <li>If this <a>Navigator</a> object's <a>battery promise</a> is not
         <code>null</code>, return this <a>Navigator</a> object's <a>battery

From e9f54425110d88b4603a312f7f6f01ed089cec10 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Thu, 21 Sep 2017 15:40:54 +0300
Subject: [PATCH 3/9] Add Feature Policy integration

---
 index.html | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 07d4086..846d778 100644
--- a/index.html
+++ b/index.html
@@ -136,7 +136,8 @@ <h2>
       </h2>
       <p>
         The following concepts, terms, and interfaces are defined in [[!HTML]],
-        [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], and [[!SECURE-CONTEXTS]]:
+        [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], [[!SECURE-CONTEXTS]], and
+        [[!FEATURE-POLICY]]:
       </p>
       <ul>
         <li>
@@ -219,6 +220,21 @@ <h2>
           "https://html.spec.whatwg.org/multipage/origin.html#same-origin-domain">
           <dfn>same-origin domain</dfn></a>
         </li>
+        <li>
+          <a href=
+          "https://wicg.github.io/feature-policy/#policy-controlled-feature"><dfn>
+          policy-controlled feature</dfn></a>
+        </li>
+        <li>
+          <a href=
+          "https://wicg.github.io/feature-policy/#feature-name"><dfn>feature
+          name</dfn></a>
+        </li>
+        <li>
+          <a href=
+          "https://wicg.github.io/feature-policy/#default-allowlist"><dfn>default
+          allowlist</dfn></a>
+        </li>
       </ul>
     </section>
     <section class="informative">
@@ -499,6 +515,20 @@ <h2>
         </table>
       </section>
     </section>
+    <section>
+      <h2>
+        Feature Policy integration
+      </h2>
+      <p data-link-for="Navigator">
+        The Battery Status API is a <a>policy-controlled feature</a>, as
+        defined by Feature Policy [[!FEATURE-POLICY]]. The <a>feature name</a>
+        for the Battery Status API is "<code>battery</code>". The <a>default
+        allowlist</a> for the Battery Status API is <code>["self"]</code>. When
+        disabled in a document, the <code><a>getBattery</a>()</code> method
+        MUST return a <a>promise</a> which rejects with a
+        "<a>SecurityError</a>" <a>DOMException</a>.
+      </p>
+    </section>
     <section class="informative">
       <h2>
         Examples

From d2458d8b2a44e2f0268ab0bfc0e46f0862531785 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Fri, 24 Aug 2018 16:18:25 +0300
Subject: [PATCH 4/9] Fix settings object and global object prose to match the
 latest HTML

- Clarify which active document's origin is tested for same origin-domain-ness
- Use 'relevant settings object' over 'current settings object' where applicable
- Update 'allowlist' to match the convention
- Use WHATWG HTML references (except for firing a simple event that's gone)
- Fix typos

Fix #19
---
 index.html | 82 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/index.html b/index.html
index 846d778..742fc0a 100644
--- a/index.html
+++ b/index.html
@@ -142,47 +142,54 @@ <h2>
       <ul>
         <li>
           <a href=
-          "https://www.w3.org/TR/html5/webappapis.html#navigator"><dfn><code>Navigator</code></dfn></a>
+          "https://html.spec.whatwg.org/#navigator"><dfn><code>Navigator</code></dfn></a>
         </li>
         <li>
           <a href=
-          "https://www.w3.org/TR/html5/webappapis.html#eventhandler"><dfn><code>
-          EventHandler</code></dfn></a>
+          "https://html.spec.whatwg.org/#eventhandler"><dfn><code>EventHandler</code></dfn></a>
         </li>
         <li>
-          <dfn><a href=
-          "https://www.w3.org/TR/html5/webappapis.html#queue-a-task">queue a
+          <dfn><a href="https://html.spec.whatwg.org/#queue-a-task">queue a
           task</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://www.w3.org/TR/html5/webappapis.html#fire-a-simple-event">fires
-          a simple event</a></dfn>
+          "https://www.w3.org/TR/html5/webappapis.html#firing-a-simple-event-named-e">
+          fires a simple event</a></dfn>
         </li>
         <li>
-          <dfn><a href=
-          "https://www.w3.org/TR/html5/webappapis.html#event-handlers">event
+          <dfn><a href="https://html.spec.whatwg.org/#event-handlers">event
           handlers</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://www.w3.org/TR/html5/webappapis.html#event-handler-event-type">
-          event handler event types</a></dfn>
+          "https://html.spec.whatwg.org/#event-handler-event-type">event
+          handler event types</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://www.w3.org/TR/html5/browsers.html#browsing-context">browsing
+          "https://html.spec.whatwg.org/#browsing-context">browsing
           context</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://www.w3.org/TR/html5/browsers.html#top-level-browsing-context">
-          top-level browsing context</a></dfn>
+          "https://html.spec.whatwg.org/#concept-relevant-global">relevant
+          global object</a></dfn>
+        </li>
+        <li>
+          <dfn><a href=
+          "https://html.spec.whatwg.org/#relevant-settings-object">relevant
+          settings object</a></dfn>
+        </li>
+        <li>
+          <dfn><a href=
+          "https://html.spec.whatwg.org/#current-settings-object">current
+          settings object</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://html.spec.whatwg.org/multipage/webappapis.html#current-settings-object">
-          current settings object</a></dfn>
+          "https://html.spec.whatwg.org/#concept-document-window">associated
+          <code>Document</code></a></dfn>
         </li>
         <li>
           <a href=
@@ -206,19 +213,16 @@ <h2>
           context</dfn></a>
         </li>
         <li>
-          <a href=
-          "https://html.spec.whatwg.org/multipage/browsers.html#active-document">
-          <dfn>active document</dfn></a>
+          <a href="https://html.spec.whatwg.org/#active-document"><dfn>active
+          document</dfn></a>
         </li>
         <li>
           <a href=
-          "https://html.spec.whatwg.org/multipage/origin.html#concept-origin"><dfn>
-          origin</dfn></a>
+          "https://html.spec.whatwg.org/#concept-origin"><dfn>origin</dfn></a>
         </li>
         <li>
-          <a href=
-          "https://html.spec.whatwg.org/multipage/origin.html#same-origin-domain">
-          <dfn>same-origin domain</dfn></a>
+          <a href="https://html.spec.whatwg.org/#same-origin-domain"><dfn>same
+          origin-domain</dfn></a>
         </li>
         <li>
           <a href=
@@ -286,18 +290,20 @@ <h2>
         the following steps:
       </p>
       <ol>
-        <li>If the <a>current settings object</a> is not a <a>secure
-        context</a>, then reject this <a>Navigator</a> object's <a>battery
-        promise</a> with a "<a>SecurityError</a>" <a>DOMException</a>, return
-        this <a>Navigator</a> object's <a>battery promise</a> and abort these
-        steps.
-        </li>
-        <li>If the <a>top-level browsing context</a>'s <a>active document</a>'s
-        <a>origin</a> and the <a>origin</a> specified by the <a>current
-        settings object</a> is not <a>same-origin domain</a>, then reject this
+        <li>If the <a>relevant settings object</a> of this <a>Navigator</a>
+        object is not a <a>secure context</a>, then reject this
         <a>Navigator</a> object's <a>battery promise</a> with a
-        "<a>SecurityError</a>" <a>DOMException</a>, return this <a>Navigator</a>
-        object's <a>battery promise</a> and abort these steps.
+        "<a>SecurityError</a>" <a>DOMException</a>, return this
+        <a>Navigator</a> object's <a>battery promise</a> and abort these steps.
+        </li>
+        <li>If this <a>Navigator</a> object's <a>relevant global object</a>'s
+        <a>associated <code>Document</code></a>'s <a>browsing context</a>'s <a>
+          active document</a>'s <a>origin</a> is not <a>same origin-domain</a>
+          with the <a>origin</a> of the <a>current settings object</a> of this
+          <a>Navigator</a> object, then reject this <a>Navigator</a> object's
+          <a>battery promise</a> with a "<a>SecurityError</a>"
+          <a>DOMException</a>, return this <a>Navigator</a> object's <a>battery
+          promise</a> and abort these steps.
         </li>
         <li>If this <a>Navigator</a> object's <a>battery promise</a> is not
         <code>null</code>, return this <a>Navigator</a> object's <a>battery
@@ -523,9 +529,9 @@ <h2>
         The Battery Status API is a <a>policy-controlled feature</a>, as
         defined by Feature Policy [[!FEATURE-POLICY]]. The <a>feature name</a>
         for the Battery Status API is "<code>battery</code>". The <a>default
-        allowlist</a> for the Battery Status API is <code>["self"]</code>. When
-        disabled in a document, the <code><a>getBattery</a>()</code> method
-        MUST return a <a>promise</a> which rejects with a
+        allowlist</a> for the Battery Status API is <code>« "self" »</code>.
+        When disabled in a document, the <code><a>getBattery</a>()</code>
+        method MUST return a <a>promise</a> which rejects with a
         "<a>SecurityError</a>" <a>DOMException</a>.
       </p>
     </section>

From fb43978a308614f085943cfa7b5461b9a8a1e852 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Tue, 2 Oct 2018 15:32:32 +0300
Subject: [PATCH 5/9] Use 'allowed to use' abstraction, reword Feature Policy
 integration

- Use 'allowed to use' as a condition for rejection, move the old
  text to a note
- Align Feature Policy integration section with the latest prose
- Fix allowlist notation
---
 index.html | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/index.html b/index.html
index 742fc0a..3df2b34 100644
--- a/index.html
+++ b/index.html
@@ -224,6 +224,10 @@ <h2>
           <a href="https://html.spec.whatwg.org/#same-origin-domain"><dfn>same
           origin-domain</dfn></a>
         </li>
+        <li>
+          <a href="https://html.spec.whatwg.org/#allowed-to-use"><dfn>allowed
+          to use</dfn></a>
+        </li>
         <li>
           <a href=
           "https://wicg.github.io/feature-policy/#policy-controlled-feature"><dfn>
@@ -297,13 +301,18 @@ <h2>
         <a>Navigator</a> object's <a>battery promise</a> and abort these steps.
         </li>
         <li>If this <a>Navigator</a> object's <a>relevant global object</a>'s
-        <a>associated <code>Document</code></a>'s <a>browsing context</a>'s <a>
-          active document</a>'s <a>origin</a> is not <a>same origin-domain</a>
-          with the <a>origin</a> of the <a>current settings object</a> of this
-          <a>Navigator</a> object, then reject this <a>Navigator</a> object's
-          <a>battery promise</a> with a "<a>SecurityError</a>"
-          <a>DOMException</a>, return this <a>Navigator</a> object's <a>battery
-          promise</a> and abort these steps.
+        <a>associated <code>Document</code></a> is not <a>allowed to use</a>
+        the <code>battery</code> feature, then reject this <a>Navigator</a>
+        object's <a>battery promise</a> with a "<a>SecurityError</a>"
+        <a>DOMException</a>, return this <a>Navigator</a> object's <a>battery
+        promise</a> and abort these steps.
+          <div class="note">
+            In other words, this step rejects if the <a>associated
+            <code>Document</code></a>'s <a>browsing context</a>'s <a>active
+            document</a>'s <a>origin</a> is not <a>same origin-domain</a> with
+            the <a>origin</a> of the <a>current settings object</a> of this
+            <a>Navigator</a> object.
+          </div>
         </li>
         <li>If this <a>Navigator</a> object's <a>battery promise</a> is not
         <code>null</code>, return this <a>Navigator</a> object's <a>battery
@@ -526,13 +535,11 @@ <h2>
         Feature Policy integration
       </h2>
       <p data-link-for="Navigator">
-        The Battery Status API is a <a>policy-controlled feature</a>, as
-        defined by Feature Policy [[!FEATURE-POLICY]]. The <a>feature name</a>
-        for the Battery Status API is "<code>battery</code>". The <a>default
-        allowlist</a> for the Battery Status API is <code>« "self" »</code>.
-        When disabled in a document, the <code><a>getBattery</a>()</code>
-        method MUST return a <a>promise</a> which rejects with a
-        "<a>SecurityError</a>" <a>DOMException</a>.
+        The Battery Status API is a <a>policy-controlled feature</a> identified
+        by the string "<code>battery</code>". It's default allowlist is
+        <code>'self'</code>. When disabled in a document, the
+        <code><a>getBattery</a>()</code> method MUST return a <a>promise</a>
+        which rejects with a "<a>SecurityError</a>" <a>DOMException</a>.
       </p>
     </section>
     <section class="informative">

From e486c5a422a8ed28627907702abedf8174d7c98d Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Wed, 3 Oct 2018 13:15:18 +0300
Subject: [PATCH 6/9] Clarify note on rejection condition

Note it is possible to explicitly grant access to cross-origin
subframes using feature policy, in which case the promise is
not rejected.
---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 3df2b34..89073cb 100644
--- a/index.html
+++ b/index.html
@@ -311,7 +311,8 @@ <h2>
             <code>Document</code></a>'s <a>browsing context</a>'s <a>active
             document</a>'s <a>origin</a> is not <a>same origin-domain</a> with
             the <a>origin</a> of the <a>current settings object</a> of this
-            <a>Navigator</a> object.
+            <a>Navigator</a> object, unless specifically allowed by the
+            document's feature policy.
           </div>
         </li>
         <li>If this <a>Navigator</a> object's <a>battery promise</a> is not

From 3e089152068c61ae97751af8be1bafaaeecbd768 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Tue, 24 Sep 2019 15:19:46 +0300
Subject: [PATCH 7/9] Replace SecurityError with NotAllowedError

---
 index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 89073cb..c847523 100644
--- a/index.html
+++ b/index.html
@@ -203,6 +203,10 @@ <h2>
           <a href=
           "https://heycam.github.io/webidl/#securityerror"><dfn><code>SecurityError</code></dfn></a>
         </li>
+        <li>
+          <a href=
+          "https://heycam.github.io/webidl/#notallowederror"><dfn><code>NotAllowedError</code></dfn></a>
+        </li>
         <li>
           <a href=
           "https://heycam.github.io/webidl/#idl-DOMException"><dfn><code>DOMException</code></dfn></a>
@@ -303,7 +307,7 @@ <h2>
         <li>If this <a>Navigator</a> object's <a>relevant global object</a>'s
         <a>associated <code>Document</code></a> is not <a>allowed to use</a>
         the <code>battery</code> feature, then reject this <a>Navigator</a>
-        object's <a>battery promise</a> with a "<a>SecurityError</a>"
+        object's <a>battery promise</a> with a "<a>NotAllowedError</a>"
         <a>DOMException</a>, return this <a>Navigator</a> object's <a>battery
         promise</a> and abort these steps.
           <div class="note">

From 7ad0dd557697ae42d88ca866516fa55b254da613 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Tue, 24 Sep 2019 15:20:28 +0300
Subject: [PATCH 8/9] Define EventTarget reference to fix a ReSpec error

Error message:
Couldn't match "EventTarget" to anything in the document or in any
other document cited in this specification: webidl
---
 index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.html b/index.html
index c847523..0c6e51b 100644
--- a/index.html
+++ b/index.html
@@ -152,6 +152,9 @@ <h2>
           <dfn><a href="https://html.spec.whatwg.org/#queue-a-task">queue a
           task</a></dfn>
         </li>
+        <li>
+          <code><dfn data-cite="DOM#eventtarget">EventTarget</dfn></code>
+        </li>
         <li>
           <dfn><a href=
           "https://www.w3.org/TR/html5/webappapis.html#firing-a-simple-event-named-e">

From 6d2ce77c25440261f639e5f275369195f0e79ec2 Mon Sep 17 00:00:00 2001
From: Anssi Kostiainen <anssi.kostiainen@gmail.com>
Date: Tue, 24 Sep 2019 15:27:49 +0300
Subject: [PATCH 9/9] Remove duplicate EventTarget definition

---
 index.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/index.html b/index.html
index 2da9b20..4194ddf 100644
--- a/index.html
+++ b/index.html
@@ -147,11 +147,6 @@ <h2>
           "https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler"><dfn><code>
           EventHandler</code></dfn></a>
         </li>
-        <li>
-          <a href=
-          "https://dom.spec.whatwg.org/#eventtarget"><dfn><code>
-          EventTarget</code></dfn></a>
-        </li>
         <li>
           <dfn><a href=
           "https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task">queue a