Make algo better

Author: noamr

source

@@ -101349,10 +101349,9 @@ interface <dfn interface>NavigationDestination</dfn> {
   <span>StructuredSerializeForStorage</span>(null)), an optional <span>serialized
   state</span>-or-null <dfn
   data-x="fire-navigate-prr-classicHistoryAPIState"><var>classicHistoryAPIState</var></dfn> (default
-  null), an optional <span>navigation API method tracker</span>-or-null <dfn
-  data-x="fire-navigate-prr-api-method-tracker"><var>apiMethodTracker</var></dfn> (default null),
-  and a list <dfn data-x="fire-navigate-prr-defer-commit-promise-list">deferCommitPromiseList</dfn>
-  (default an empty list):</p>
+  null), and an optional <span>navigation API method tracker</span>-or-null <dfn
+  data-x="fire-navigate-prr-api-method-tracker"><var>apiMethodTracker</var></dfn> (default
+  null):</p>
 
   <ol>
    <li><p>Let <var>document</var> be <var>navigation</var>'s <span>relevant global object</span>'s <span
@@ -101393,9 +101392,6 @@ interface <dfn interface>NavigationDestination</dfn> {
    data-x="concept-NavigateEvent-classic-history-API-state">classic history API state</span> to
    <var>classicHistoryAPIState</var>.</p></li>
 
-   <li><p>Set <var>event</var>'s <span>deferred commit promise list</span> to
-   <var>deferCommitPromiseList</var>.</p></li>
-
    <li><p>Let <var>destination</var> be a <span>new</span> <code>NavigationDestination</code>
    created in <var>navigation</var>'s <span data-x="concept-relevant-realm">relevant
    realm</span>.</p></li>
@@ -106441,8 +106437,6 @@ location.href = '#foo';</code></pre>
      <var>navigationAPIState</var> is not null; otherwise,
      <span>StructuredSerializeForStorage</span>(undefined).</p></li>
 
-     <li><p>Let <var>deferCommitPromiseList</var> be an empty list.</p></li>
-
      <li><p>Let <var>continue</var> be the result of <span data-x="fire a push/replace/reload
      navigate event">firing a push/replace/reload <code data-x="event-navigate">navigate</code>
      event</span> at <var>navigation</var> with <i
@@ -106454,11 +106448,9 @@ location.href = '#foo';</code></pre>
      data-x="fire-navigate-prr-formDataEntryList">formDataEntryList</i> set to
      <var>entryListForFiring</var>, <i data-x="fire-navigate-prr-destinationURL">destinationURL</i>
      set to <var>url</var>, <i data-x="fire-navigate-prr-navigationAPIState">navigationAPIState</i>
-     set to <var>navigationAPIStateForFiring</var>, <i
+     set to <var>navigationAPIStateForFiring</var>, and <i
      data-x="fire-navigate-prr-api-method-tracker">apiMethodTracker</i> set to
-     <var>apiMethodTracker</var>, and <i
-     data-x="fire-navigate-prr-defer-commit-promise-list">deferCommitPromiseList</i> set to
-     <var>deferCommitPromiseList</var>.</p></li>
+     <var>apiMethodTracker</var>.</p></li>
 
      <li><p>If <var>continue</var> is false, then return.</p>
     </ol>
@@ -106470,29 +106462,9 @@ location.href = '#foo';</code></pre>
     data-x="navigate-fragid">navigate to a fragment</span> path.</p>
    </li>
 
-   <li><p>Let <var>proceedWithCommit</var> be false.</p></li>
-
-   <li><p><span>Wait for all</span> <var>deferCommitPromiseList</var> with the following steps as
-   both the success and failure step: set <var>proceedWithCommit</var> to true.</p></li>
-
-   <li>
-    <p>Let <var>waitForCommitDeferringConditions</var> be the following steps:</p>
-
-    <ol>
-     <li><p><span>Assert</span>: this is running <span>in parallel</span>.</p></li>
-
-     <li>
-      <p>Wait until any of the following becomes true:</p>
-
-      <ul>
-       <li><p><var>proceedWithCommit</var> is true; or</p></li>
-
-       <li><p><var>navigable</var>'s <span>ongoing navigation</span> changes to no longer equal
-       <var>navigationId</var>.</p></li>
-      </ul>
-     </li>
-    </ol>
-   </li>
+   <li><p>Let <var>shouldDeferCommit</var> be true if <var>navigation</var>'s <span>ongoing <code
+   data-x="event-navigate">navigate</code> event</span>'s <span>deferred commit promise list</span>
+   is non-empty; Otherwise false.</p></li>
 
    <li><p>If <var>sourceDocument</var> is <var>navigable</var>'s <span
    data-x="nav-container-document">container document</span>, then <span>reserve deferred fetch
@@ -106683,9 +106655,8 @@ location.href = '#foo';</code></pre>
       <var>targetSnapshotParams</var>, <var>userInvolvement</var>, <var>navigationId</var>,
       <var>navigationParams</var>, <var>cspNavigationType</var>, with <i
       data-x="attempt-to-populate-allow-post">allowPOST</i> set to true, <i
-      data-x="attempt-to-populate-wait-for-commit-deferring-conditions">waitForCommitDeferringConditions</i>
-      set to <var>waitForCommitDeferringConditions</var>, and <i
-      data-x="attempt-to-populate-completion-steps">completionSteps</i> set to the following
+      data-x="attempt-to-populate-defer-commit">deferCommit</i> set to <var>shouldDeferCommit</var>,
+      and <i data-x="attempt-to-populate-completion-steps">completionSteps</i> set to the following
       step:</p>
 
       <ol>
@@ -108062,10 +108033,9 @@ location.href = '#foo';</code></pre>
   (default null), an optional <span>navigation params</span>-or-null <var>navigationParams</var>
   (default null), an optional string <var>cspNavigationType</var> (default "<code
   data-x="">other</code>"), an optional boolean <dfn
-  data-x="attempt-to-populate-allow-post"><var>allowPOST</var></dfn> (default false), optional
-  algorithm steps <dfn
-  data-x="attempt-to-populate-wait-for-commit-deferring-conditions"><var>waitForCommitDeferringCondition</var></dfn>
-  (default an empty algorithm), and optional algorithm steps <dfn
+  data-x="attempt-to-populate-allow-post"><var>allowPOST</var></dfn> (default false), an optional
+  boolean <dfn data-x="attempt-to-populate-defer-commit"><var>deferCommit</var></dfn> (default
+  false), and optional algorithm steps <dfn
   data-x="attempt-to-populate-completion-steps"><var>completionSteps</var></dfn> (default an empty
   algorithm):</p>
 
@@ -108147,16 +108117,33 @@ location.href = '#foo';</code></pre>
     </ol>
    </li>
 
-   <li><p>Call <var>waitForCommitDeferringConditions</var>.</p></li>
-
-   <li id="process-a-navigate-response">
-    <p><span>Queue a global task</span> on the <span>navigation and traversal task source</span>,
-    given <var>navigable</var>'s <span>active window</span>, to run these steps:</p>
+   <li>
+    <p>Let <dfn data-x="process a navigate response"><var>processNavigateResponse</var></dfn> be to
+    <span>queue a global task</span> on the <span>navigation and traversal task source</span>, given
+    <var>navigable</var>'s <span>active window</span>, to run these steps:</p>
 
     <ol>
      <li><p>If <var>navigable</var>'s <span>ongoing navigation</span> no longer equals
      <var>navigationId</var>, then run <var>completionSteps</var> and abort these steps.</p></li>
 
+     <li>
+      <p>If <var>shouldDeferCommit</var> is true, then:</p>
+
+      <ol>
+       <li>
+        <p><span>Potentially defer commit</span> given <var>navigable</var>,
+        <var>navigationId</var>, and the following steps:</p>
+
+        <ol>
+         <li><p>Set <var>shouldDeferCommit</var> to false.</p></li>
+
+         <li><p>Call <var>processNavigateResponse</var>.</p></li>
+        </ol>
+       </li>
+       <li><p>Abort these steps.</p></li>
+      </ol>
+     </li>
+
      <li>
       <p>Let <var>saveExtraDocumentState</var> be true.</p>
 
@@ -109175,6 +109162,48 @@ location.href = '#foo';</code></pre>
   </ol>
   </div>
 
+  <div algorithm>
+  <p>To <dfn>potentially defer commit</dfn> given a <span>navigable</span> <var>navigable</var>, a
+  <span>navigation ID</span> <var>navigationID</var>, and an algorithm <var>proceed</var>:</p>
+
+  <ol>
+   <li><p>Let <var>document</var> be <var>navigable</var>'s <span data-x="nav-document">active
+   document</span>.</p></li>
+
+   <li>
+    <p><span>Queue a task</span> on the <span>DOM manipulation task source</span> given
+    <var>document</var>'s <span>releant global object</span> to run the steps:</p>
+
+    <ol>
+     <li><p>If <var>navigable</var> <span>ongoing navigation</span> is not <var>navigationID</var>,
+     then call <var>proceed</var> and abort these steps.</p></li>
+
+     <li><p>Let <var>didProceed</var> be false.</p></li>
+
+     <li>
+      <p>Let <var>done</var> be the steps:</p>
+
+      <ol>
+       <li><p>If <var>didProceed</var> is false, call <var>proceed</var>.</p></li>
+
+       <li><p>Set <var>didProceed</var> to false.</p></li>
+      </ol>
+     </li>
+
+     <li><p>Let <var>event</var> be <var>document</var>'s <span>relevant global object</span>'s
+     <span data-x="window-navigation-api">navigation API</span>'s <span>ongoing <code
+     data-x="event-navigate">navigate</code> event</span>.</p></li>
+
+     <li><p><span>Wait for all</span> <var>event</var>'s <span>deferred commit promise list</span>,
+     with <var>done</var> as the success and failure steps.</p></li>
+
+     <li><p><span data-x="AbortSignal-add">Add</span> <var>done</var> to <var>event</var>'s <code
+     data-x="dom-NavigateEvent-signal">signal</code>.</p></li>
+    </ol>
+   </li>
+  </ol>
+  </div>
+
   <div algorithm>
   <p>An element has a <dfn>browsing context scope origin</dfn> if its <code>Document</code>'s
   <span>node navigable</span> is a <span>top-level traversable</span> or if all of its