From f01820e10c21abebddcec39c9f14c9ec1e29a97f Mon Sep 17 00:00:00 2001
From: Domenic Denicola <d@domenic.me>
Date: Tue, 23 Nov 2021 15:24:37 -0500
Subject: [PATCH 1/2] Further fixes to focus delegation

This ensures that focus delegation, used by both delegatesFocus and <dialog>, does not traverse into non-delegatesFocus shadow trees. Otherwise you would get unintuitive results in situations such as the following:

<div id="outer">
<#shadowroot delegatesFocus=true>
  <div id="inner>
  <#shadowroot delegatesFocus=false>
    <input>
  </#shadowroot>
  </div>
</#shadowroot>
</div>

In such a scenario, with the previous specification, inner.focus() would not focus anything, since inner's shadow root does not delegate focus so we never hit the "focus delegate" algorithm. But outer.focus() would focus the <input> element, since with it having delegatesFocus=true, we use the "focus delegate" algorithm, which would look at all shadow-including descendants. After this change, both inner.focus() and outer.focus() would not focus anything, since the <input> is hidden inside a delegatesFocus=false shadow tree.

Discovered in https://matrixlogs.bakkot.com/WHATWG/2021-11-23#L36-L62.
---
 source | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/source b/source
index 6912026b81c..f73d42a7535 100644
--- a/source
+++ b/source
@@ -2986,7 +2986,7 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
      <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#dom-shadowroot-slot-assignment">slot assignment</dfn> concept</li>
      <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#concept-slotable">slottable</dfn> concept</li>
      <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#assign-slotables-for-a-tree">assign slottables for a tree</dfn> algorithm</li>
-     <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#concept-tree-inclusive-descendant">inclusive descendants</dfn> concept</li>
+     <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#concept-tree-inclusive-descendant">inclusive descendant</dfn> concept</li>
      <li>The <dfn data-x="finding flattened slottables" data-x-href="https://dom.spec.whatwg.org/#find-flattened-slotables">find flattened slottables</dfn> algorithm</li>
      <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#slottable-manual-slot-assignment">manual slot assignment</dfn> concept</li>
      <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#assign-a-slot">assign a slot</dfn> algorithm</li>
@@ -75218,12 +75218,43 @@ END:VCARD</pre>
    data-x="focusable area">focusable areas</span> whose <span>DOM anchor</span> is a
    <span>shadow-including descendant</span> of <var>focus target</var>.</p></li>
 
-   <li><p>If <var>possible focus delegates</var> is empty, then return null.</p></li>
-
    <li><p>Sort <var>possible focus delegates</var> by <span>shadow-including tree order</span> of
    their <span data-x="DOM anchor">DOM anchors</span>.</p></li>
 
-   <li><p>Return <var>possible focus delegates</var>[0].</p></li>
+   <li>
+    <p>For each <var>possible focus delegate</var> of <var>possible focus delegates</var>:</p>
+
+    <ol>
+     <li><p>Let <var>is still a candidate</var> be true.</p></li>
+
+     <li><p>Let <var>root</var> be <var>possible focus delegate</var>'s <span>DOM anchor</span>'s
+     <span>root</span>.</p></li>
+
+     <li>
+      <p>While <var>root</var> is a <span>shadow root</span>:</p>
+
+      <ol>
+       <li><p>If <var>focus target</var> is an <span>inclusive descendant</span> of
+       <var>root</var>, then <span>break</span>.</p></li>
+
+       <li><p>If <var>root</var>'s <span>delegates focus</span> is false, then set
+       <var>is still a candidate</var> to false and <span>break</span>.</p></li>
+
+       <li><p>Set <var>root</var> to <var>root</var>'s <span
+       data-x="concept-DocumentFragment-host">host</span>'s <span>root</span>.</p></li>
+      </ol>
+     </li>
+
+     <li><p>If <var>is still a candidate</var> is true, then return <var>possible focus
+     delegate</var>.</p></li>
+    </ol>
+
+    <p class="note">The intent is to return the first <span>focusable area</span> in <var>possible
+    focus delegates</var> where the path between its <span>DOM anchor</span> and <var>focus
+    target</var> delegates focus at any shadow tree boundaries.</p>
+   </li>
+
+   <li><p>Return null.</p></li>
   </ol>
 
   <p>The <dfn>autofocus delegate</dfn> for a <var>focus target</var> given a <var>focus

From b32437519041447fb0fb2631f91e57f3491e8ab0 Mon Sep 17 00:00:00 2001
From: Domenic Denicola <d@domenic.me>
Date: Fri, 7 Jan 2022 13:35:11 -0500
Subject: [PATCH 2/2] Rewrite as tree traversal

---
 source | 63 ++++++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/source b/source
index f73d42a7535..f7cbf7cee35 100644
--- a/source
+++ b/source
@@ -75175,14 +75175,11 @@ END:VCARD</pre>
 
    <dd>
     <ol>
-     <li><p>Let <var>root</var> be <var>focus target</var>'s <span
-     data-x="concept-element-shadow-root">shadow root</span>.</p></li>
-
-     <li><p>If <var>root</var> is a <span>shadow-including inclusive ancestor</span> of the
+     <li><p>If <var>focus target</var> is a <span>shadow-including inclusive ancestor</span> of the
      <span>currently focused area of a top-level browsing context</span>'s <span>DOM anchor</span>,
      then return null.</p></li>
 
-     <li><p>Return the <span>focus delegate</span> for <var>root</var> given <var>focus
+     <li><p>Return the <span>focus delegate</span> for <var>focus target</var> given <var>focus
      trigger</var>.</p></li>
     </ol>
 
@@ -75203,60 +75200,48 @@ END:VCARD</pre>
   steps:</p>
 
   <ol>
-   <li><p>Let <var>autofocus delegate</var> be the <span>autofocus delegate</span> for
-   <var>focus target</var> given <var>focus trigger</var>.</p></li>
+   <li><p>Let <var>autofocus delegate</var> be the <span>autofocus delegate</span> for <var>focus
+   target</var> given <var>focus trigger</var>.</p></li>
 
    <li><p>If <var>autofocus delegate</var> is not null, then return <var>autofocus
    delegate</var>.</p></li>
 
-   <li><p>If <var>focus trigger</var> is "<code data-x="">click</code>", then let <var>possible
-   focus delegates</var> be the list of all <span>click focusable</span> <span data-x="focusable
-   area">focusable areas</span> whose <span>DOM anchor</span> is a <span>shadow-including
-   descendant</span> of <var>focus target</var>.</p></li>
+   <li><p>If <var>focus target</var> is a <span>shadow host</span> and its <span
+   data-x="concept-element-shadow-root">shadow root</span>'s <span>delegates focus</span> is false,
+   then return null.</p></li>
 
-   <li><p>Otherwise, let <var>possible focus delegates</var> be the list of all <span
-   data-x="focusable area">focusable areas</span> whose <span>DOM anchor</span> is a
-   <span>shadow-including descendant</span> of <var>focus target</var>.</p></li>
+   <li><p>Let <var>parent</var> be <var>focus target</var>.</p></li>
 
-   <li><p>Sort <var>possible focus delegates</var> by <span>shadow-including tree order</span> of
-   their <span data-x="DOM anchor">DOM anchors</span>.</p></li>
+   <li><p>If <var>parent</var> is a <span>shadow host</span>, then set <var>parent</var> to
+   <var>parent</var>'s <span data-x="concept-element-shadow-root">shadow root</span>.</p></li>
 
    <li>
-    <p>For each <var>possible focus delegate</var> of <var>possible focus delegates</var>:</p>
+    <p><span data-x="list iterate">For each</span> <var>child</var> of <var>parent</var>'s <span
+    data-x="concept-tree-child">children</span>:</p>
 
     <ol>
-     <li><p>Let <var>is still a candidate</var> be true.</p></li>
-
-     <li><p>Let <var>root</var> be <var>possible focus delegate</var>'s <span>DOM anchor</span>'s
-     <span>root</span>.</p></li>
-
      <li>
-      <p>While <var>root</var> is a <span>shadow root</span>:</p>
-
-      <ol>
-       <li><p>If <var>focus target</var> is an <span>inclusive descendant</span> of
-       <var>root</var>, then <span>break</span>.</p></li>
-
-       <li><p>If <var>root</var>'s <span>delegates focus</span> is false, then set
-       <var>is still a candidate</var> to false and <span>break</span>.</p></li>
+      <p>Let <var>focusable area</var> be <var>child</var>, if <var>child</var> is a
+      <span>focusable area</span>; otherwise let <var>focusable area</var> be the result of <span
+      data-x="get the focusable area">getting the focusable area</span> for <var>child</var> given
+      <var>focus trigger</var>.</p>
 
-       <li><p>Set <var>root</var> to <var>root</var>'s <span
-       data-x="concept-DocumentFragment-host">host</span>'s <span>root</span>.</p></li>
-      </ol>
+      <p class="note">This step can end up recursing, i.e., the <span>get the focusable area</span>
+      steps might return the <span>focus delegate</span> of <var>child</var>.</p>
      </li>
 
-     <li><p>If <var>is still a candidate</var> is true, then return <var>possible focus
-     delegate</var>.</p></li>
+     <li><p>If <var>focusable area</var> is not null, then return <var>focusable
+     area</var>.</p></li>
     </ol>
-
-    <p class="note">The intent is to return the first <span>focusable area</span> in <var>possible
-    focus delegates</var> where the path between its <span>DOM anchor</span> and <var>focus
-    target</var> delegates focus at any shadow tree boundaries.</p>
    </li>
 
    <li><p>Return null.</p></li>
   </ol>
 
+  <p class="note">The above algorithm essentially returns the first suitable <span>focusable
+  area</span> where the path between its <span>DOM anchor</span> and <var>focus target</var>
+  delegates focus at any shadow tree boundaries.</p>
+
   <p>The <dfn>autofocus delegate</dfn> for a <var>focus target</var> given a <var>focus
   trigger</var> is given by the following steps:</p>