From 3f82c08c0b2c69cc1e8231eddf232c474eb4db9f Mon Sep 17 00:00:00 2001
From: Jan-Ivar Bruaroey <wingboy@gmail.com>
Date: Tue, 3 May 2022 18:00:12 -0400
Subject: [PATCH] Reference relevant global object directly.

---
 getusermedia.html | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/getusermedia.html b/getusermedia.html
index a8dfa7f0..c9438eda 100644
--- a/getusermedia.html
+++ b/getusermedia.html
@@ -781,7 +781,7 @@ <h4>Life-cycle</h4>
         device as soon as any live track sourced by the device
         becomes both [= track/muted | unmuted =] and
         [= track/enabled =] again, provided that track's
-        [=relevant settings object=]'s [=relevant global object=]'s [=associated `Document`=]
+        [=relevant global object=]'s [=associated `Document`=]
         <a data-cite="!HTML/#gains-focus">has focus</a> at that time. If the
         document does not <a data-cite="!HTML/#gains-focus">have focus</a> at that time,
         the UA SHOULD instead queue a task to <a data-lt=muted>mute</a> the
@@ -2740,7 +2740,6 @@ <h3>{{MediaDevices}}</h3>
           <p>Let <var>lastExposedDevices</var> be the result of
           [=creating a list of device info objects=] for
           {{MediaDevices/[[storedDeviceList]]}} and the
-          [=relevant settings object=]'s
           [=relevant global object=]'s [=associated `Document`=].</p>
         </li>
         <li>
@@ -2750,8 +2749,8 @@ <h3>{{MediaDevices}}</h3>
         <li>
           <p>Let <var>newExposedDevices</var> be the result of
           [=creating a list of device info objects=] for
-          <var>deviceList</var> and the [=relevant settings object=]'s
-          [=relevant global object=]'s [=associated `Document`=].</p>
+          <var>deviceList</var> and the [=relevant global object=]'s
+          [=associated `Document`=].</p>
         </li>
         <li>
           <p>If the {{MediaDeviceInfo}} objects in <var>newExposedDevices</var>
@@ -2835,8 +2834,8 @@ <h2>Methods</h2>
                   <ol>
                     <li>
 
-                      <p>Let <var>document</var> be the [=relevant settings object=]'s
-                      [=relevant global object=]'s [=associated `Document`=].</p>
+                      <p>Let <var>document</var> be the [=relevant global object=]'s
+                      [=associated `Document`=].</p>
                     </li>
                     <li>
                       <p>The [=User Agent=] MUST wait to proceed to the next step until
@@ -2958,7 +2957,8 @@ <h2>Methods</h2>
               information across browsing sessions and origins via the availability
               of media capture devices, it adds to the
               fingerprinting surface exposed by the [=User Agent=].</p>
-              <p class="fingerprint">As long as the [=relevant settings object=]'s [=relevant global object=]'s [=associated `Document`=] did not capture, this method will
+              <p class="fingerprint">As long as the [=relevant global object=]'s
+              [=associated `Document`=] did not capture, this method will
               limit exposure to two bits of information: whether there is a camera
               and whether there is a microphone. A [=User Agent=] may mitigate this by
               pretending the system has a camera and a microphone, for instance until the
@@ -3042,7 +3042,8 @@ <h2>Device information exposure</h2>
             [=device information can be exposed=] is <code>true</code>.
           </li>
           <li>
-            <p>If the [=relevant settings object=]'s [=relevant global object=]'s [=associated `Document`=] is [=Document/fully active=] and
+            <p>If the [=relevant global object=]'s [=associated `Document`=] is
+            [=Document/fully active=] and
             <a data-cite="!HTML/#gains-focus">has focus</a>, return
             <code>true</code>.</p>
           </li>
@@ -3071,9 +3072,8 @@ <h2>Device information exposure</h2>
         <ol>
           <li>
             <p>If any of the local devices of kind "videoinput" are attached to a live
-            {{MediaStreamTrack}} in the [=relevant settings object=]'s
-            [=relevant global object=]'s [=associated `Document`=], return
-            <code>true</code>.</p>
+            {{MediaStreamTrack}} in the [=relevant global object=]'s
+            [=associated `Document`=], return <code>true</code>.</p>
           </li>
           <li>
             <p>Return {{MediaDevices/[[canExposeCameraInfo]]}}.</p>
@@ -3085,9 +3085,8 @@ <h2>Device information exposure</h2>
         <ol>
           <li>
             <p>If any of the local devices of kind "audioinput" are attached to a live
-            {{MediaStreamTrack}} in the [=relevant settings object=]'s
-            [=relevant global object=]'s [=associated `Document`=], return
-            <code>true</code>.</p>
+            {{MediaStreamTrack}} in the [=relevant global object=]'s
+            [=associated `Document`=], return <code>true</code>.</p>
           </li>
           <li>
             <p>Return {{MediaDevices/[[canExposeMicrophoneInfo]]}}.</p>
@@ -3493,8 +3492,8 @@ <h2>Methods</h2>
                   succeed.</p>
                 </li>
                 <li>
-                  <p>Let <var>document</var> be the [=relevant settings object=]'s
-                  [=relevant global object=]'s [=associated `Document`=].</p>
+                  <p>Let <var>document</var> be the [=relevant global object=]'s
+                  [=associated `Document`=].</p>
                 </li>
                 <li>
                   <p>If <var>document</var> is NOT
@@ -3522,8 +3521,7 @@ <h2>Methods</h2>
                   <ol>
                     <li>
                       <p>The [=User Agent=] MUST wait to proceed to the next step until
-                      the [=relevant settings object=]'s
-                      [=relevant global object=]'s [=associated `Document`=] is
+                      the [=relevant global object=]'s [=associated `Document`=] is
                       [=Document/fully active=] and
                       <a data-cite="!HTML/#gains-focus">has focus.</a></p>
                     </li>