Return error on abort during reload

Author: noamr

source

@@ -99404,9 +99404,8 @@ interface <dfn interface>NavigationHistoryEntry</dfn> : <span>EventTarget</span>
     data-x="navigation-hh">historyHandling</i> set to <var>options</var>["<code
     data-x="dom-NavigationNavigateOptions-history">history</code>"], <i
     data-x="navigation-navigation-api-state">navigationAPIState</i> set to
-    <var>serializedState</var>, and <i
-    data-x="navigation-api-method-tracker">apiMethodTracker</i> set to
-    <var>apiMethodTracker</var>.</p>
+    <var>serializedState</var>, and <i data-x="navigation-api-method-tracker">apiMethodTracker</i>
+    set to <var>apiMethodTracker</var>.</p>
 
     <p class="note">Unlike <code data-x="dom-location-assign">location.assign()</code> and friends,
     which are exposed across <span data-x="same origin-domain">origin-domain</span> boundaries,
@@ -99419,12 +99418,6 @@ interface <dfn interface>NavigationHistoryEntry</dfn> : <span>EventTarget</span>
     <code>Navigation</code> object itself (i.e., <var>document</var>).</p>
    </li>
 
-   <li><p>If <var>apiMethodTracker</var>'s<span
-   data-x="navigation-api-method-tracker-phase">phase</span> is not "<code
-   data-x="">ongoing</code>", then return an <span data-x="navigation-api-early-error-result">early
-   error result</span> for an <span>"<code>AbortError</code>"</span>
-   <code>DOMException</code>.</p></li>
-
    <li><p>Return a <span>navigation API method tracker-derived result</span> for
    <var>apiMethodTracker</var>.</p></li>
   </ol>
@@ -99694,12 +99687,22 @@ interface <dfn interface>NavigationHistoryEntry</dfn> : <span>EventTarget</span>
   </div>
 
   <div algorithm>
-  <p>A <dfn>navigation API method tracker-derived result</dfn> for a <span>navigation API method
-  tracker</span> is a <code>NavigationResult</code> dictionary instance given by «[ "<code
-  data-x="dom-NavigationResult-committed">committed</code>" → <var>apiMethodTracker</var>'s <span
-  data-x="navigation-api-method-tracker-committed">committed promise</span>, "<code
-  data-x="dom-NavigationResult-finished">finished</code>" → <var>apiMethodTracker</var>'s <span
-  data-x="navigation-api-method-tracker-finished">finished promise</span> ]».</p>
+  <p>To compute the <dfn>navigation API method tracker-derived result</dfn> for a <span>navigation
+  API method tracker</span>-or-null <var>apiMethodTracker</var>:</p>
+
+  <ol>
+   <li><p>If <var>apiMethodTracker</var> is null, or if its <span
+   data-x="navigation-api-method-tracker-promoted">promoted</span> is false, then return an <span
+   data-x="navigation-api-early-error-result">early error result</span> for an
+   <span>"<code>AbortError</code>"</span> <code>DOMException</code>.</p></li>
+
+   <li><p>Return a <code>NavigationResult</code> dictionary instance given by «[ "<code
+   data-x="dom-NavigationResult-committed">committed</code>" → <var>apiMethodTracker</var>'s <span
+   data-x="navigation-api-method-tracker-committed">committed promise</span>, "<code
+   data-x="dom-NavigationResult-finished">finished</code>" → <var>apiMethodTracker</var>'s <span
+   data-x="navigation-api-method-tracker-finished">finished promise</span> ]».</p></li>
+   </ol>
+
   </div>
 
   </div>
@@ -99837,9 +99840,8 @@ const p2 = navigation.navigate(url2).finished;</code></pre>
    <li><p>A <dfn data-x="navigation-api-method-tracker-finished">finished promise</dfn>, a
    promise</p></li>
 
-   <li><p>A <dfn data-x="navigation-api-method-tracker-phase">phase</dfn>, one of "<code
-   data-x="">upcoming</code>", "<code data-x="">ongoing</code>",  "<code data-x="">defunct</code>",
-   or "<code data-x="">traverse</code>".</p></li>
+   <li><p>A <dfn data-x="navigation-api-method-tracker-promoted">promoted</dfn>, a boolean,
+   initially set to false.</p></li>
   </ul>
 
   <p>All this state is then managed via the following algorithms.</p>
@@ -99881,11 +99883,8 @@ const p2 = navigation.navigate(url2).finished;</code></pre>
     </div>
    </li>
 
-   <li><p>Let <var>phase</var> be "<code data-x="">upcoming</code>".</p></li>
-
    <li id="dont-always-set-upcoming-non-traverse-api-method-tracker">
-    <p>If <var>navigation</var> <span>has entries and events disabled</span>, then set
-    <var>phase</var> to "<code data-x="">defunct</code>".</p>
+    <p>If <var>navigation</var> <span>has entries and events disabled</span>, then return null.</p>
 
     <p class="note">If <var>navigation</var> <span>has entries and events disabled</span>, then
     <var>committedPromise</var> and <var>finishedPromise</var> will never fulfill (since we never
@@ -99921,9 +99920,6 @@ const p2 = navigation.navigate(url2).finished;</code></pre>
 
      <dt><span data-x="navigation-api-method-tracker-finished">finished promise</span></dt>
      <dd><var>finishedPromise</var></dd>
-
-     <dt><span data-x="navigation-api-method-tracker-phase">phase</span></dt>
-     <dd><var>phase</var></dd>
     </dl>
    </li>
   </ol>
@@ -99969,9 +99965,6 @@ const p2 = navigation.navigate(url2).finished;</code></pre>
 
      <dt><span data-x="navigation-api-method-tracker-finished">finished promise</span></dt>
      <dd><var>finishedPromise</var></dd>
-
-     <dt><span data-x="navigation-api-method-tracker-phase">phase</span></dt>
-     <dd><code data-x="">traverse</code></dd>
     </dl>
    </li>
 
@@ -101362,22 +101355,14 @@ interface <dfn interface>NavigationDestination</dfn> {
      <li><p><span>Assert</span>: <var>navigation</var>'s <span>upcoming traverse API method
      trackers</span> <span data-x="list is empty">is empty</span>.</p></li>
 
-     <li><p><span>Assert</span>: <var>apiMethodTracker</var> is null, or its <span
-     data-x="navigation-api-method-tracker-phase">phase</span> is "<code
-     data-x="">defunct</code>".</p></li>
-
      <li><p>Return true.</p></li>
     </ol>
 
     <p class="note">These assertions holds because <code
     data-x="dom-Navigation-traverseTo">traverseTo()</code>, <code
     data-x="dom-Navigation-back">back()</code>, and <code
     data-x="dom-Navigation-forward">forward()</code> will immediately fail when entries and events
-    are disabled (since there are no entries to traverse to), and if our starting point is instead
-    <code data-x="dom-Navigation-navigate">navigate()</code> or <code
-    data-x="dom-Navigation-reload">reload()</code>, then the <span>navigation API method
-    tracker</span> was <a
-    href="#dont-always-set-upcoming-non-traverse-api-method-tracker">defunct</a>.</p>
+    are disabled (since there are no entries to traverse to).</p>
    </li>
 
    <li><p><span>Assert</span>: <var>navigation</var>'s <span>ongoing API method tracker</span> is
@@ -101418,8 +101403,7 @@ interface <dfn interface>NavigationDestination</dfn> {
    </li>
 
    <li><p>If <var>apiMethodTracker</var> is not null, then set <var>apiMethodTracker</var>'s <span
-   data-x="navigation-api-method-tracker-phase">phase</span> to "<code
-   data-x="">ongoing</code>".</p></li>
+   data-x="navigation-api-method-tracker-promoted">promoted</span> to true.</p></li>
 
    <li><p>Set <var>navigation</var>'s <span>ongoing API method tracker</span> to
    <var>apiMethodTracker</var>.</p></li>
@@ -107640,8 +107624,8 @@ location.href = '#foo';</code></pre>
   optional <span>user navigation involvement</span> <dfn
   data-x="reload-user-involvement"><var>userInvolvement</var></dfn> (default "<code
   data-x="uni-none">none</code>"), and an optional <span>navigation API method
-  tracker</span>-or-null <dfn
-  data-x="reload-api-method-tracker"><var>apiMethodTracker</var></dfn> (default null):</p>
+  tracker</span>-or-null <dfn data-x="reload-api-method-tracker"><var>apiMethodTracker</var></dfn>
+  (default null):</p>
 
   <ol>
    <li>