Also fix delegatesFocus and autofocus=""

9ba7124 updated delegatesFocus to use the shadow tree, as part of whatwg#7207. However we forgot to update the autofocus="" processing in the same way.
dandclark · Dec 4, 2021 · 24d0840 · 24d0840
1 parent 58d4ff4
commit 24d0840
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/source b/source
@@ -75311,27 +75311,27 @@ END:VCARD</pre>
 
    <dd>
     <ol>
-     <li><p>If <var>focus target</var>'s <span data-x="concept-element-shadow-root">shadow
-     root</span> 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>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
+     <span>currently focused area of a top-level browsing context</span>'s <span>DOM anchor</span>,
+     then return null.</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>Let <var>autofocus delegate</var> be the <span>autofocus delegate</span> for
+     <var>root</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>'s <span
-     data-x="concept-element-shadow-root">shadow root</span>.</p></li>
+     descendant</span> of <var>root</var>.</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>'s <span
-     data-x="concept-element-shadow-root">shadow root</span>.</p></li>
+     <span>shadow-including descendant</span> of <var>root</var>.</p></li>
 
      <li><p>If <var>possible focus delegates</var> is empty, then return null.</p></li>