From 04ede15c8855565dee5d7f3ae4be5c76a879d96d Mon Sep 17 00:00:00 2001
From: Youenn Fablet <youennf@gmail.com>
Date: Tue, 28 Mar 2023 11:45:10 +0200
Subject: [PATCH] Update how FocusChangeDisabled is set to true in case of
 change of focus. The change covers potential race conditions where the change
 of focus task is already enqueued at the time the getDisplayMedia promise is
 resolved. Add a note to talk about the requirement behind these steps and
 that it should apply to any type of picker, whether user agent level or OS
 level.

---
 index.html | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/index.html b/index.html
index fe0cf0b..7d810a8 100644
--- a/index.html
+++ b/index.html
@@ -423,6 +423,24 @@ <h2>
                       abort these steps. 
                     </p>
                   </li>
+                  <li>
+                    <p>If the <a>current settings object</a>'s's [=relevant global object=]'s [=associated Document=]'s
+                      [=top-level browsing context=] is losing <a data-cite="!HTML/#gains-focus">focus</a>,
+                      queue a global task on the <a data-cite="!HTML/#user-interaction-task-source">user interaction task source</a>
+                      given <a>current settings object</a>'s [=relevant global object=] to run the following step:
+                      <ol>
+                        <li><p>Set <var>controller</var>.{{CaptureController/[[FocusChangeDisabled]]}} to <code>true</code>.</p></li>
+                      </ol>
+                    </p>
+                    <p class="note">
+                      These steps ensure {{CaptureController}} will not override explicit focus actions made by the user,
+                      typically if a user decides to switch to another surface shortly after starting capture.
+                      This algorithm describes what to do for surface pickers implemented by the <a>user agent</a> but the same
+                      requirement applies to surface pickers implemented outside of the <a>user agent</a>,
+                      where the loss of capturing document focus is not necessarily the signal triggering setting
+                      {{CaptureController/[[FocusChangeDisabled]]}} to<code>true</code>.
+                    </p>
+                  </li>
                   <li>
                     <p><em>Permission Failure</em>: [=Reject=]
                     <var>p</var> with a new {{DOMException}}
@@ -435,23 +453,6 @@ <h2>
                 <p>Return <var>p</var>.</p>
               </li>
             </ol>
-            <p>
-              When the top-level document loses focus, run the following steps on all
-              {{CaptureController}} objects in that document and in documents of its nested
-              [=browsing contexts=]:
-            </p>
-            <ol>
-              <li>
-                <p>
-                  If {{CaptureController/[[Source]]}} is <code>undefined</code>, abort these steps.
-                </p>
-              </li>
-              <li>
-                <p>
-                  Set {{CaptureController/[[FocusChangeDisabled]]}} to <code>true</code>.
-                </p>
-              </li>
-            </ol>
             <p>
               The <a>user agent</a> MUST NOT capture content that's behind a
               partially transparent captured <a>display surface</a>.