Make promises unsettled when entries are disabled

Author: noamr

source

@@ -99691,16 +99691,18 @@ interface <dfn interface>NavigationHistoryEntry</dfn> : <span>EventTarget</span>
   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
+   <li><p>If <var>apiMethodTracker</var> has been <span
+   data-x="navigation-api-method-tracker-promoted">promoted</span>, or if
+   <var>apiMethodTracker</var>'s <span data-x="navigation-api-method-tracker-navigation">navigation
+   object</span> <span>has entries and events disabled</span>, then 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>
+
+   <li><p>Otherwise, 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>
    </ol>
 
   </div>
@@ -99883,19 +99885,6 @@ const p2 = navigation.navigate(url2).finished;</code></pre>
     </div>
    </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 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
-    create a <code>NavigationHistoryEntry</code> object for such <code>Document</code>s, and so we
-    have nothing to resolve them with); there is no <code>NavigationHistoryEntry</code> to apply
-    <var>serializedState</var> to; and there is no <code data-x="event-navigate">navigate</code>
-    event to include <var>info</var> with. So, we don't need to track this API method call after
-    all.</p>
-   </li>
-
-
    <li>
     <p>Return a new <span>navigation API method tracker</span> with:</p>
 
@@ -101249,14 +101238,38 @@ interface <dfn interface>NavigationDestination</dfn> {
   state</span>-or-null <dfn
   data-x="fire-navigate-prr-classicHistoryAPIState"><var>classicHistoryAPIState</var></dfn> (default
   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>:</p>
+  data-x="fire-navigate-prr-api-method-tracker"><var>apiMethodTrackerForNavigateOrReload</var></dfn>:</p>
 
   <ol>
+   <li>
+    <p>If <var>navigation</var> <span>has entries and events disabled</span>, then set
+    <var>apiMethodTrackerForNavigateOrReload</var> to null.</p>
+   
+    <p class="note">If <var>navigation</var> <span>has entries and events disabled</span>, then
+    <code data-x="dom-Navigation-navigate">navigate()</code> and <code
+    data-x="dom-Navigation-reload">reload()</code> calls return promises that will never fulfill
+    (since we never create a <code>NavigationHistoryEntry</code> object for such
+    <code>Document</code>s, and so we have nothing to resolve them with); there is no
+    <code>NavigationHistoryEntry</code> to apply <var>serializedState</var> to; and there is no
+    <code data-x="event-navigate">navigate</code> event to include <var>info</var> with. So, we
+    don't need to track this API method call after all.</p>
+   </li>
+
    <li><p><span>Inform the navigation API about aborting navigation</span> in
    <var>navigation</var>'s <span>relevant global object</span>'s <span
    data-x="concept-document-window">associated <code>Document</code></span>'s <span>node
    navigable</span>.</p></li>
 
+   <li>
+    <p>If <var>apiMethodTrackerForNavigateOrReload</var> is non-null, and <var>navigation</var>'s
+    <span>relevant global object</span>'s <span data-x="concept-document-window">associated
+    <code>Document</code></span> is not <span>fully active</span>, then return false.</p>
+
+    <p class="note">This would occur if the document became inactive as a result of aborting the
+    ongoing navigation, e.g., if a <code data-x="event-navigateerror">navigateerror</code> handler
+    synchronously removed its <span>navigable</span>.</p>
+   </li>
+
    <li><p>Let <var>event</var> be the result of <span>creating an event</span> given
    <code>NavigateEvent</code>, in <var>navigation</var>'s <span
    data-x="concept-relevant-realm">relevant realm</span>.</p></li>
@@ -101355,21 +101368,7 @@ 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>If <var>apiMethodTracker</var> is non-null, then:</p>
-
-      <ol>
-       <li><p>Assert: <var>navigation</var>'s <span>relevant global object</span>'s <span
-       data-x="concept-document-window">associated <code>Document</code></span> is not <span>fully
-       active</span>.</p></li>
-
-       <li><p>Return false.</p></li>
-      </ol>
-
-      <p class="note">This would occur if the document became inactive as a result of aborting the
-      ongoing navigation, e.g., if a <code data-x="event-navigateerror">navigateerror</code> handler
-      removed its <span>navigable</span>.</p>
-     </li>
+     <li><p><span>Assert</span>: <var>apiMethodTracker</var> is null.</p></li>
 
      <li><p>Return true.</p></li>
     </ol>
@@ -101419,7 +101418,8 @@ 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-promoted">promoted</span> to true.</p></li>
+   data-x="navigation-api-method-tracker-status">status</span> to "<code
+   data-x="">ongoing</code>".</p></li>
 
    <li><p>Set <var>navigation</var>'s <span>ongoing API method tracker</span> to
    <var>apiMethodTracker</var>.</p></li>