Two more monkeypatches and supporting algorithms

Author: domfarolino

source

@@ -110734,15 +110734,34 @@ location.href = '#foo';</code></pre>
     given <var>document</var>'s <span>relevant global object</span> to run these steps:</p>
 
     <ol>
-     <li><p>If <var>document</var> has no parser, or its parser has <span data-x="stop
-     parsing">stopped parsing</span>, or the user agent has reason to believe the user is no longer
-     interested in scrolling to the <span data-x="concept-url-fragment">fragment</span>, then abort
-     these steps.</p></li>
+     <li><p>If the user agent has reason to believe the user is no longer interested in scrolling to
+     the <span data-x="concept-url-fragment">fragment</span>, then set <var>document</var>'s
+     <span>pending text directives</span> to null and abort these steps.</p></li>
+
+     <li>
+      <p>If <var>document</var> has no parser, or its parser has <span data-x="stop parsing">stopped
+      parsing</span>, then.</p>
+
+      <ol>
+       <li>
+        <p>If <var>document</var>'s <span>pending text directives</span> is not null, then.</p>
+
+        <ol>
+         <li><p>Set <var>document</var>'s <span>pending text directives</span> to null.</p></li>
+
+         <li><p><span>Scroll to the fragment</span> given <var>document</var>.</p></li>
+        </ol>
+       </li>
+
+       <li><p>Abort these steps.</p></li>
+      </ol>
+     </li>
 
      <li><p><span>Scroll to the fragment</span> given <var>document</var>.</p></li>
 
      <li><p>If <var>document</var>'s <span>indicated part</span> is still null, then <span>try to
-     scroll to the fragment</span> for <var>document</var>.</p></li>
+     scroll to the fragment</span> for <var>document</var>. Otherwise, set <var>document</var>'s
+     <span>pending text directives</span> to null.</p></li>
     </ol>
    </li>
   </ol>
@@ -110973,18 +110992,63 @@ location.href = '#foo';</code></pre>
     <p>Otherwise:</p>
 
     <ol>
-     <li><p><span>Assert</span>: <var>document</var>'s <span>indicated part</span> is an
-     element.</p></li>
+     <li><p><span>Assert</span>: <var>document</var>'s <span>indicated part</span> is an element or
+     a <span>range</span>.</p></li>
+
+     <li><p>Let <var>scrollTarget</var> be <var>document</var>'s <span>indicated part</span>.</p></li>
+
+     <li><p>Let <var>target</var> be <var>scrollTarget</var>.</p></li>
+
+     <li>
+      <p>If <var>target</var> is a <span>range</span>, then:</p>
+
+      <ol>
+       <li><p>Set <var>target</var> to the <span>first common ancestor</span> of <var>target</var>'s
+       <span data-x="concept-range-start-node">start node</span> and <var>target</var>'s <span
+       data-x="concept-range-end-node">end node</span>.</p></li>
+
+       <li>
+        <p><span>While</span> <var>target</var> is not null and is not an <span>element</span>, set
+        <var>target</var> to <var>target</var>'s <span>parent</span>.</p>
+
+        <p class="XXX">What should this do if <var>target</var> is inside a shadow tree? See <a
+        href="https://github.com/WICG/scroll-to-text-fragment/issues/190">WICG/scroll-to-text-fragment#190</a>
+        for discussion.</p>
+       </li>
+      </ol>
+     </li>
 
-     <li><p>Let <var>target</var> be <var>document</var>'s <span>indicated part</span>.</p></li>
+     <li><p><span>Assert</span>: <var>target</var> is an <span>element</span>.</p></li>
 
      <li><p>Set <var>document</var>'s <span>target element</span> to <var>target</var>.</p></li>
 
-     <li><p>Run the <span>ancestor revealing algorithm</span> on <var>target</var>.</p></li>
+     <li>
+      <p>Run the <span>ancestor revealing algorithm</span> on <var>target</var>.</p>
+
+      <p class="XXX">This currently won't work well with <span data-x="text directive">text
+      directives</span>, since <var>target</var> could be an ancestor or even the root document
+      node. <a
+      href="https://github.com/WICG/scroll-to-text-fragment/issues/89">WICG/scroll-to-text-fragment#89</a>
+      proposes restricting matches to "<code data-x="">contain:style layout</code>" blocks which
+      would resolve this problem.</p>
+     </li>
 
-     <li><p><span data-x="scroll a target into view">Scroll <var>target</var> into view</span>,
-     with <i>behavior</i> set to "auto", <i>block</i> set to "start", and <i>inline</i>
-     set to "nearest". <ref>CSSOMVIEW</ref></p></li>
+     <li>
+      <p>Let <var>blockPosition</var> be "<code data-x="">center</code>" if <var>scrollTarget</var>
+      is a <span>range</span>, and "<code data-x="">start</code>" otherwise.</p>
+
+      <p class="note">Scrolling to a <span>text directive</span> centers it in the block flow
+      direction.</p>
+     </li>
+
+     <li>
+      <p><span data-x="scroll a target into view">Scroll <var>scrollTarget</var> into
+     view</span>, with <i>behavior</i> set to "auto", <i>block</i> set to <var>blockPosition</var>,
+     and <i>inline</i> set to "nearest". <ref>CSSOMVIEW</ref></p>
+
+      <p>Implementations may avoid scrolling to the target if it is produced from a <span>text
+      directive</span>.</p>
+     </li>
 
      <li><p>Run the <span>focusing steps</span> for <var>target</var>, with the
      <code>Document</code>'s <span>viewport</span> as the <var>fallback target</var>.</p></li>
@@ -115798,6 +115862,32 @@ Add a helper algorithm for removing and returning a fragment directive string fr
   </ol>
   </div>
 
+  <div algorithm>
+  <p>To find the <dfn>first common ancestor</dfn> of two nodes <var>nodeA</var> and
+  <var>nodeB</var>, follow these steps:</p>
+
+  <ol>
+   <li><p>Let <var>commonAncestor</var> be <var>nodeA</var>.</p></li>
+
+   <li><p><span>While</span> <var>commonAncestor</var> is non-null and is not a
+   <span>shadow-including inclusive ancestor</span> of <var>nodeB</var>, let
+   <var>commonAncestor</var> be <var>commonAncestor</var>'s
+   <span>shadow-including parent</span>.</p></li>
+
+   <li><p>Return <var>commonAncestor</var>.</p></li>
+  </ol>
+  </div>
+
+  <div algorithm>
+  <p>To find the <dfn>shadow-including parent</dfn> of <var>node</var> follow these steps:</p>
+
+  <ol>
+   <li><p>If <var>node</var> is a <span>shadow root</span>, then return <var>node</var>'s <span
+   data-x="concept-DocumentFragment-host">host</span>.</p></li>
+
+   <li><p>Otherwise, return <var>node</var>'s <span>parent</span>.</p></li>
+  </ol>
+  </div>
 
   <div algorithm>
   <p>To <dfn>find a range from a node list</dfn> given a search string <var>queryString</var>, a <span>range</span> <var>searchRange</var>, a <span>list</span> of <code>Text</code> nodes <var>nodes</var>, and booleans <var>wordStartBounded</var>, <var>wordEndBounded</var> and <var>matchMustBeAtBeginning</var>, follow these steps: